diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 397f154..616b71f 100644
--- a/GIS Base Map/Gun Run.qgs	
+++ b/GIS Base Map/Gun Run.qgs	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveUser="tim" saveDateTime="2022-07-27T13:14:22" version="3.26.1-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
+<qgis saveUser="tim" projectname="Gun Run" version="3.26.1-Buenos Aires" saveDateTime="2022-08-19T13:46:19" saveUserFull="Timothy Allen">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,98 +21,211 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group name="Marshals" checked="Qt::Unchecked" groupLayer="" expanded="0">
+    <layer-tree-group expanded="1" name="Marshals" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_exp="" name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./marshal_positions.shp|layername=marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="cached_name" value="marshal_positions" 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 legend_exp="" name="extra_security" id="extra_security20170921130834191" patch_size="0,0" legend_split_behavior="0" source="./extra_security.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="extra_security" id="extra_security20170921130834191" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./extra_security.shp">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="marshals_by_position" id="marshals_by_position20161003112326575" patch_size="0,0" legend_split_behavior="0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" providerKey="delimitedtext" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="complete_marshal_overview" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" providerKey="virtual" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="marshal_overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" legend_split_behavior="0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" providerKey="ogr" expanded="0">
+      <layer-tree-layer expanded="1" name="marshals_by_position" id="marshals_by_position20161003112326575" patch_size="0,0" legend_split_behavior="0" providerKey="delimitedtext" checked="Qt::Unchecked" legend_exp="" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="cached_name" value="marshals_by_position" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="complete_marshal_overview" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" legend_split_behavior="0" providerKey="virtual" checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="0" name="marshal_overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./marshal overviews.shp|layername=marshal overviews">
+        <customproperties>
+          <Option type="Map">
+            <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 name="Fencing and Cones" checked="Qt::Unchecked" groupLayer="" expanded="0">
+    <layer-tree-group expanded="0" name="Fencing and Cones" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_exp="" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing">
         <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="cached_name" value="fencing" 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 legend_exp="" name="fence_groups" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" patch_size="0,0" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual" expanded="1">
+      <layer-tree-layer expanded="1" name="fence_groups" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" patch_size="0,0" legend_split_behavior="0" providerKey="virtual" checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" checked="Qt::Checked" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group name="Markers" checked="Qt::Checked" groupLayer="" expanded="1">
+      <layer-tree-group expanded="1" name="Markers" groupLayer="" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer legend_exp="" name="route_markers" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" patch_size="-1,-1" legend_split_behavior="0" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={b44a1939-247b-4566-889e-a31ad931ccdc}" checked="Qt::Checked" providerKey="memory" expanded="1">
+        <layer-tree-layer expanded="1" name="route_markers" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" patch_size="-1,-1" legend_split_behavior="0" providerKey="memory" 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=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(4,0)&amp;uid={56882179-64ce-409f-a00e-427b24f6e9d7}">
           <customproperties>
             <Option type="Map">
-              <Option value="1" name="showFeatureCount" type="int"/>
+              <Option name="showFeatureCount" value="1" type="int"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer legend_exp="" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
         <customproperties>
           <Option type="Map">
+            <Option name="cached_name" value="all_routes" type="QString"/>
             <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 legend_exp="" name="timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" legend_split_behavior="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " checked="Qt::Unchecked" providerKey="ogr" expanded="0">
+    <layer-tree-layer expanded="0" name="timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" 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' ">
       <customproperties>
-        <Option/>
+        <Option type="Map">
+          <Option name="cached_name" value="timelapse" type="QString"/>
+        </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group name="Feeding Stations" checked="Qt::Unchecked" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" name="Feeding Stations" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_exp="" name="water_tables" id="water_tables20170921142016467" patch_size="0,0" legend_split_behavior="0" source="./water_tables.shp" checked="Qt::Checked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="water_tables" id="water_tables20170921142016467" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./water_tables.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="water_tables" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" name="Ask Me" groupLayer="" checked="Qt::Unchecked">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="1" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./poi_labels.shp|layername=poi_labels">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="poi_labels" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="directions_to_start" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" name="Residents Access" groupLayer="" checked="Qt::Unchecked">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="1" name="mayor" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./mayor.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="mayor" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="viplabels" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./viplabels.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="viplabels" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="vipaccess" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./vipaccess.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="vipaccess" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="0" name="golfaccess" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./golfaccess.shp">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="residents_access_roads" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./residents_access.shp|layername=residents_access">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="1" name="OSM data" groupLayer="" checked="Qt::Checked">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="0" name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./osm_roads.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="osm_roads [3887]" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./osm_places.shp|layername=osm_places">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="osm_places [7]" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" name="Start and Finish pages" groupLayer="" checked="Qt::Unchecked">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="1" name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./data-comments.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./start_finish_area.shp">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -120,124 +233,34 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Ask Me" checked="Qt::Unchecked" groupLayer="" expanded="0">
+    <layer-tree-group expanded="0" name="Elevation" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_exp="" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Residents Access" checked="Qt::Unchecked" groupLayer="" expanded="0">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer legend_exp="" name="mayor" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" legend_split_behavior="0" source="./mayor.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="viplabels" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" legend_split_behavior="0" source="./viplabels.shp" checked="Qt::Checked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="vipaccess" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" legend_split_behavior="0" source="./vipaccess.shp" checked="Qt::Checked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="golfaccess" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" legend_split_behavior="0" source="./golfaccess.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="0">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./capetownelevation-1m.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" legend_split_behavior="0" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="OSM data" checked="Qt::Checked" groupLayer="" expanded="1">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer legend_exp="" name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" legend_split_behavior="0" source="./osm_roads.shp" checked="Qt::Checked" providerKey="ogr" expanded="0">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" legend_split_behavior="0" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" providerKey="ogr" expanded="1">
-        <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 name="Start and Finish pages" checked="Qt::Unchecked" groupLayer="" expanded="0">
+    <layer-tree-group expanded="1" name="Map" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_exp="" name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" legend_split_behavior="0" source="./data-comments.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="0" name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" legend_split_behavior="0" providerKey="gdal" checked="Qt::Checked" legend_exp="" source="./GDAL-City of Cape Town 2015 Aerial.xml">
         <customproperties>
           <Option type="Map">
+            <Option name="cached_name" value="GDAL-City of Cape Town 2015 Aerial" type="QString"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" legend_split_behavior="0" source="./start_finish_area.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Elevation" checked="Qt::Unchecked" groupLayer="" expanded="0">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer legend_exp="" name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" legend_split_behavior="0" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option value="1" name="showFeatureCount" type="QString"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Map" checked="Qt::Checked" groupLayer="" expanded="1">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" providerKey="gdal" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" legend_split_behavior="0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" providerKey="wms" expanded="1">
+      <layer-tree-layer expanded="1" name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" legend_split_behavior="0" providerKey="wms" 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">
         <customproperties>
           <Option type="Map">
+            <Option name="cached_name" value="Outlines" type="QString"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
@@ -268,34 +291,35 @@
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
       <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
-      <item>route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8</item>
+      <item>route_markers_6943d827_bf32_40af_988d_60a736c1d3e1</item>
+      <item>marshals_by_position20161003112326575</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" tolerance="10" minScale="0" self-snapping="1" type="1" mode="3" maxScale="0" intersection-snapping="1" enabled="1" scaleDependencyMode="0">
+  <snapping-settings intersection-snapping="1" maxScale="0" scaleDependencyMode="0" minScale="0" unit="1" tolerance="10" type="1" enabled="0" mode="3" self-snapping="1">
     <individual-layer-settings>
-      <layer-setting tolerance="12" minScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" type="1" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="20" minScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" maxScale="0" enabled="1" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" type="0" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="0" minScale="0" id="water_tables20170921142016467" type="2" maxScale="0" enabled="0" units="2"/>
-      <layer-setting tolerance="12" minScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" type="1" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" type="1" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" type="1" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="0" minScale="0" id="extra_security20170921130834191" type="2" maxScale="0" enabled="0" units="2"/>
-      <layer-setting tolerance="12" minScale="0" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" maxScale="0" enabled="0" units="1"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="2" maxScale="0" minScale="0" id="extra_security20170921130834191" tolerance="0" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" type="1" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" type="1" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" type="1" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" type="1" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" tolerance="12" type="0" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" type="2" enabled="1"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="2" maxScale="0" minScale="0" id="water_tables20170921142016467" tolerance="0" type="2" enabled="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -303,10 +327,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.3729499167874053</xmin>
-      <ymin>-33.97819360374913344</ymin>
-      <xmax>18.53236032035363223</xmax>
-      <ymax>-33.9227329700244411</ymax>
+      <xmin>18.37202099282994183</xmin>
+      <ymin>-33.95282887119950033</ymin>
+      <xmax>18.42648561685178876</xmax>
+      <ymax>-33.88874265129132368</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -327,161 +351,161 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" open="false" checked="Qt::Unchecked">
-      <legendlayer name="marshal_positions" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <legendgroup name="Marshals" checked="Qt::Checked" open="true">
+      <legendlayer name="marshal_positions" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="extra_security" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="extra_security" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="marshals_by_position" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="marshals_by_position" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="complete_marshal_overview" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="marshal_overviews" showFeatureCount="0" drawingOrder="-1" open="false" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="false">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" open="false" checked="Qt::Unchecked">
-      <legendlayer name="fencing" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
+      <legendlayer name="fencing" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="fence_groups" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="fence_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" open="true" checked="Qt::Checked">
-      <legendgroup name="Markers" open="true" checked="Qt::Checked">
-        <legendlayer name="route_markers" showFeatureCount="1" drawingOrder="-1" open="true" checked="Qt::Checked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
+    <legendgroup name="Routes" checked="Qt::Checked" open="true">
+      <legendgroup name="Markers" checked="Qt::Unchecked" open="true">
+        <legendlayer name="route_markers" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer name="all_routes" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="all_routes" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer name="timelapse" showFeatureCount="0" drawingOrder="-1" open="false" checked="Qt::Unchecked">
-      <filegroup open="false" hidden="false">
+    <legendlayer name="timelapse" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="false">
+      <filegroup hidden="false" open="false">
         <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup name="Feeding Stations" open="true" checked="Qt::Unchecked">
-      <legendlayer name="water_tables" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Feeding Stations" checked="Qt::Unchecked" open="true">
+      <legendlayer name="water_tables" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" open="false" checked="Qt::Unchecked">
-      <legendlayer name="poi_labels" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
+      <legendlayer name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="directions_to_start" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" open="false" checked="Qt::Unchecked">
-      <legendlayer name="mayor" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
+      <legendlayer name="mayor" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="viplabels" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="viplabels" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="vipaccess" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="vipaccess" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="golfaccess" showFeatureCount="0" drawingOrder="-1" open="false" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="false">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="residents_access_roads" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="residents_access" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" open="true" checked="Qt::Checked">
-      <legendlayer name="osm_roads" showFeatureCount="1" drawingOrder="-1" open="false" checked="Qt::Checked">
-        <filegroup open="false" hidden="false">
+    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
+      <legendlayer name="osm_roads" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="false">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="osm_places" showFeatureCount="1" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="osm_places" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" open="false" checked="Qt::Unchecked">
-      <legendlayer name="data-comments" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="false">
+      <legendlayer name="data-comments" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="start_finish_area" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Elevation" open="false" checked="Qt::Unchecked">
-      <legendlayer name="capetownelevation-1m" showFeatureCount="1" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
+      <legendlayer name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" open="true" checked="Qt::Checked">
-      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <legendgroup name="Map" checked="Qt::Checked" open="true">
+      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="Outlines" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="Outlines" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer refreshOnNotifyMessage="" legendPlaceholderImage="" autoRefreshTime="0" autoRefreshEnabled="0" type="annotation" refreshOnNotifyEnabled="0">
+  <main-annotation-layer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" type="annotation" legendPlaceholderImage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -532,7 +556,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" legendPlaceholderImage="" autoRefreshTime="0" autoRefreshEnabled="0" type="raster" maxScale="100000" refreshOnNotifyEnabled="0">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" maxScale="100000" minScale="1e+08" autoRefreshTime="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="raster" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -597,7 +621,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -622,58 +646,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" fetchMode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" symbology="Line" band="1" enabled="0" zscale="1">
+      <elevation zoffset="0" symbology="Line" zscale="1" enabled="0" band="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -704,36 +728,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -748,9 +772,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>
@@ -759,27 +783,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 zoomedOutResamplingMethod="nearestNeighbour" enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer redBand="1" nodataColor="" blueBand="3" greenBand="2" type="multibandcolor" alphaBand="-1" opacity="0.5">
+        <rasterrenderer opacity="0.5" redBand="1" alphaBand="-1" blueBand="3" nodataColor="" type="multibandcolor" greenBand="2">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -790,14 +814,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation saturation="0" colorizeStrength="100" colorizeRed="255" colorizeBlue="128" invertColors="0" colorizeGreen="128" colorizeOn="0" grayscaleMode="0"/>
+        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
+        <huesaturation colorizeBlue="128" colorizeStrength="100" invertColors="0" grayscaleMode="0" colorizeRed="255" saturation="0" colorizeGreen="128" colorizeOn="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" legendPlaceholderImage="" autoRefreshTime="0" autoRefreshEnabled="0" type="raster" maxScale="0" refreshOnNotifyEnabled="0">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" maxScale="0" minScale="1e+08" autoRefreshTime="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="raster" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -862,7 +886,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -885,58 +909,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" fetchMode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" symbology="Line" band="1" enabled="0" zscale="1">
+      <elevation zoffset="0" symbology="Line" zscale="1" enabled="0" band="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -967,36 +991,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -1011,9 +1035,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>
@@ -1022,27 +1046,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 zoomedOutResamplingMethod="nearestNeighbour" enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer nodataColor="" type="singlebandcolordata" alphaBand="-1" band="1" opacity="0.75">
+        <rasterrenderer opacity="0.75" alphaBand="-1" nodataColor="" type="singlebandcolordata" band="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1053,23 +1077,23 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation saturation="0" colorizeStrength="100" colorizeRed="255" colorizeBlue="128" invertColors="0" colorizeGreen="128" colorizeOn="0" grayscaleMode="0"/>
+        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
+        <huesaturation colorizeBlue="128" colorizeStrength="100" invertColors="0" grayscaleMode="0" colorizeRed="255" saturation="0" colorizeGreen="128" colorizeOn="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
-        <ymin>-33.95649000000000228</ymin>
+        <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
         <ymax>-33.89943083574347327</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37527226735897301</xmin>
-        <ymin>-33.95649000000000228</ymin>
+        <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
         <ymax>-33.89943083574347327</ymax>
       </wgs84extent>
@@ -1125,7 +1149,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1139,8 +1163,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field name="length_m" comment="" precision="0" length="6" expression="$length" typeName="integer" type="2" subType="0"/>
-        <field name="length_km" comment="" precision="0" length="-1" expression="$length / 1000" typeName="double precision" type="6" subType="0"/>
+        <field expression="$length" typeName="integer" name="length_m" precision="0" comment="" subType="0" length="6" type="2"/>
+        <field expression="$length / 1000" typeName="double precision" name="length_km" precision="0" comment="" subType="0" length="-1" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1153,58 +1177,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="RouteLen" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="RouteLen" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -1235,36 +1259,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -1279,44 +1303,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -1339,52 +1363,53 @@
               <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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas" symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" label="Active Routes">
-            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" symbol="1" filter="&quot;Source&quot; = '21KM'" label="21KM" checkstate="0"/>
-            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" symbol="2" filter="&quot;Source&quot; = '10KM'" label="10KM" checkstate="0"/>
-            <rule key="{871a9276-8278-4528-911c-7e434c0885d3}" description="This should be disabled, since it's only for legends" symbol="3" filter="&quot;Source&quot; = '5KM'" label="5KM" checkstate="0"/>
-            <rule key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends" symbol="4" filter="&quot;Source&quot; = 'Trail'" label="Trail" checkstate="0"/>
+          <rule checkstate="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0" label="Active Routes" description="Only show when active in Atlas">
+            <rule checkstate="0" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1" label="21KM" description="This should be disabled, since it's only for legends"/>
+            <rule checkstate="0" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2" label="10KM" description="This should be disabled, since it's only for legends"/>
+            <rule checkstate="0" filter="&quot;Source&quot; = '5KM'" key="{871a9276-8278-4528-911c-7e434c0885d3}" symbol="3" label="5KM" description="This should be disabled, since it's only for legends"/>
+            <rule checkstate="0" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="4" label="Trail" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="5" label="Always show" checkstate="0"/>
+          <rule checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="5" label="Always show"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="6" label="Show by day"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -1404,44 +1429,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 name="@0@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -1457,32 +1482,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 name="@@0@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@0@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -1497,15 +1522,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>
@@ -1515,33 +1540,33 @@
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -1572,36 +1597,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">
               <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"/>
@@ -1621,40 +1646,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 name="@0@2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -1677,15 +1702,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="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>
@@ -1693,22 +1718,22 @@
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -1728,40 +1753,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 name="@0@3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -1784,47 +1809,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -1844,44 +1869,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 name="@1@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -1897,32 +1922,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 name="@@1@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -1937,15 +1962,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>
@@ -1955,33 +1980,33 @@
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -2012,36 +2037,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">
               <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"/>
@@ -2061,40 +2086,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 name="@1@2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2117,15 +2142,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>
@@ -2133,22 +2158,22 @@
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -2168,40 +2193,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 name="@1@3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2224,47 +2249,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 name="2" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -2284,44 +2309,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 name="@2@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2337,32 +2362,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 name="@@2@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -2377,15 +2402,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>
@@ -2395,33 +2420,33 @@
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -2452,36 +2477,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">
               <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"/>
@@ -2501,40 +2526,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 name="@2@2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2557,15 +2582,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>
@@ -2573,22 +2598,22 @@
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -2608,40 +2633,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 name="@2@3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2664,47 +2689,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 name="3" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -2724,44 +2749,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 name="@3@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2777,32 +2802,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 name="@@3@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@3@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -2817,15 +2842,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>
@@ -2835,33 +2860,33 @@
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -2892,36 +2917,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">
               <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"/>
@@ -2941,40 +2966,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 name="@3@2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2997,15 +3022,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>
@@ -3013,22 +3038,22 @@
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -3048,40 +3073,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 name="@3@3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -3104,47 +3129,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 name="4" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -3164,44 +3189,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 name="@4@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -3217,32 +3242,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 name="@@4@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@4@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -3257,15 +3282,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>
@@ -3275,33 +3300,33 @@
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -3332,36 +3357,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">
               <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"/>
@@ -3381,40 +3406,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 name="@4@2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -3437,15 +3462,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>
@@ -3453,22 +3478,22 @@
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -3488,40 +3513,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 name="@4@3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -3544,58 +3569,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 name="5" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -3626,15 +3651,95 @@
               <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 name="6" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
+            <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 locked="0" pass="0" class="SimpleLine" enabled="1">
+              <Option type="Map">
+                <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"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <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 name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3645,43 +3750,43 @@
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{0ba56ba6-21a8-4c4c-9148-41f946721f2a}">
-          <rule key="{4f8efdda-7a44-4a18-ab72-9bbcbcdbd62c}" active="0" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+        <rules key="{4378179d-f926-41f4-9594-bdfa682c8a9f}">
+          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{573bc779-5c0e-4f9d-97f0-32cc9764b982}" description="Active routes">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="round($length / 1000, 0)" fontItalic="0">
+              <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="round($length / 1000, 0)" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="0,0,0,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="markerSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <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">
                       <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"/>
@@ -3704,34 +3809,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 name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -3746,98 +3851,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="3" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="km_marker()" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="0" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="1" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="LineGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="1" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="3" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="0" geometryGenerator="km_marker()" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -3846,9 +3951,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"/>
@@ -3856,8 +3961,12 @@
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option 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>
@@ -3866,47 +3975,47 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -3937,9 +4046,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>
@@ -3947,12 +4056,12 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -3967,8 +4076,8 @@
           <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>
@@ -3977,8 +4086,8 @@
           <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>
@@ -3987,8 +4096,8 @@
           <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>
@@ -3997,8 +4106,8 @@
           <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>
@@ -4007,8 +4116,8 @@
           <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>
@@ -4017,8 +4126,8 @@
           <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>
@@ -4027,8 +4136,8 @@
           <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>
@@ -4037,14 +4146,21 @@
           <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 name="Sort" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="day" configurationFlags="None">
+          <editWidget type="Range">
             <config>
               <Option/>
             </config>
@@ -4054,8 +4170,8 @@
           <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>
@@ -4064,8 +4180,8 @@
           <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>
@@ -4081,69 +4197,74 @@
         <alias name="" field="RouteLen" index="6"/>
         <alias name="" field="Source" index="7"/>
         <alias name="" field="Sort" index="8"/>
-        <alias name="" field="length_m" index="9"/>
-        <alias name="" field="length_km" index="10"/>
+        <alias name="" field="day" index="9"/>
+        <alias name="" field="length_m" index="10"/>
+        <alias name="" field="length_km" index="11"/>
       </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="length_m" expression="" applyOnUpdate="0"/>
-        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default expression="" field="descriptio" applyOnUpdate="0"/>
+        <default expression="" field="timestamp" applyOnUpdate="0"/>
+        <default expression="" field="begin" applyOnUpdate="0"/>
+        <default expression="" field="end" applyOnUpdate="0"/>
+        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default expression="" field="RouteLen" applyOnUpdate="0"/>
+        <default expression="" field="Source" applyOnUpdate="0"/>
+        <default expression="" field="Sort" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
+        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Sort" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="Sort" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="length_m" comment="" precision="0" length="6" expression="$length" typeName="integer" type="2" subType="0"/>
-        <field name="length_km" comment="" precision="0" length="-1" expression="$length / 1000" typeName="double precision" type="6" subType="0"/>
+        <field expression="$length" typeName="integer" name="length_m" precision="0" comment="" subType="0" length="6" type="2"/>
+        <field expression="$length / 1000" typeName="double precision" name="length_km" precision="0" comment="" subType="0" length="-1" type="6"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Name&quot;">
         <columns>
-          <column width="152" name="Name" type="field" hidden="0"/>
-          <column width="-1" name="descriptio" type="field" hidden="0"/>
-          <column width="-1" name="timestamp" type="field" hidden="0"/>
-          <column width="163" name="begin" type="field" hidden="0"/>
-          <column width="-1" name="end" type="field" hidden="0"/>
-          <column width="-1" name="Distance" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="RouteLen" type="field" hidden="0"/>
-          <column width="-1" name="Source" type="field" hidden="0"/>
-          <column width="-1" name="length_m" type="field" hidden="0"/>
-          <column width="-1" name="Sort" type="field" hidden="0"/>
-          <column width="-1" name="length_km" type="field" hidden="0"/>
+          <column width="152" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="163" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column width="-1" name="Sort" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4175,23 +4296,27 @@ 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="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 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"/>
@@ -4202,8 +4327,10 @@ def my_form_open(dialog, layer, feature):
         <field reuseLastValue="0" name="Distance"/>
         <field reuseLastValue="0" name="Name"/>
         <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
         <field reuseLastValue="0" name="Source"/>
         <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
         <field reuseLastValue="0" name="descriptio"/>
         <field reuseLastValue="0" name="end"/>
         <field reuseLastValue="0" name="length_km"/>
@@ -4215,7 +4342,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -4288,58 +4415,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -4370,36 +4497,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -4414,44 +4541,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -4474,54 +4601,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -4552,9 +4679,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>
@@ -4565,9 +4692,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>
       </customproperties>
       <blendMode>0</blendMode>
@@ -4608,23 +4735,23 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="elevation" index="2"/>
       </aliases>
       <defaults>
-        <default field="ID" expression="" applyOnUpdate="0"/>
-        <default field="height" expression="" applyOnUpdate="0"/>
-        <default field="elevation" expression="" applyOnUpdate="0"/>
+        <default expression="" field="ID" applyOnUpdate="0"/>
+        <default expression="" field="height" applyOnUpdate="0"/>
+        <default expression="" field="elevation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="ID" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="height" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="elevation" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="ID" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="height" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="elevation" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint field="ID" desc="" exp=""/>
+        <constraint field="height" desc="" exp=""/>
+        <constraint field="elevation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
@@ -4649,17 +4776,17 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="Polygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.94678832168284544</ymin>
-        <xmax>18.42124635930919041</xmax>
+        <ymin>-33.95871753779982782</ymin>
+        <xmax>18.42424810950425851</xmax>
         <ymax>-33.8965939968351222</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.94678832168284544</ymin>
-        <xmax>18.42124635930919041</xmax>
+        <ymin>-33.95871753779982782</ymin>
+        <xmax>18.42424810950425851</xmax>
         <ymax>-33.8965939968351222</ymax>
       </wgs84extent>
       <id>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</id>
@@ -4724,58 +4851,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -4806,36 +4933,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -4850,44 +4977,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -4910,38 +5037,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -4956,9 +5083,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>
@@ -4969,9 +5096,9 @@ 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>
@@ -5007,30 +5134,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="day" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias name="" field="id" index="0"/>
         <alias name="" field="type" index="1"/>
         <alias name="" field="page" index="2"/>
+        <alias name="" field="day" index="3"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="page" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="page" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="page" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
@@ -5055,7 +5193,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5120,7 +5258,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5145,58 +5283,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -5227,36 +5365,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -5271,44 +5409,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -5331,54 +5469,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -5409,9 +5547,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>
@@ -5422,32 +5560,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="Name" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="Name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -5462,67 +5600,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="5" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="2" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="LineGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="LineGeometry" xOffset="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="4" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="2" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="5" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -5531,47 +5669,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -5602,9 +5740,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>
@@ -5612,12 +5750,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -5648,26 +5786,26 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="Name" index="1"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="Name" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Name" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="Name" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5699,8 +5837,8 @@ 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 name="Name" labelOnTop="0"/>
@@ -5712,7 +5850,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5777,7 +5915,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5802,58 +5940,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -5884,36 +6022,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -5928,44 +6066,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -5988,48 +6126,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas" symbol="0" filter="&quot;distance&quot; = '21KM'" label="21KM"/>
-          <rule key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas" symbol="1" filter="&quot;distance&quot; = '10KM'" label="10KM"/>
-          <rule key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas" symbol="2" filter="&quot;distance&quot; = '5KM'" label="5KM"/>
+          <rule filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" label="21KM" description="Only show when active in Atlas"/>
+          <rule filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" label="10KM" description="Only show when active in Atlas"/>
+          <rule filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" label="5KM" description="Only show when active in Atlas"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -6049,40 +6187,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 name="@0@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6105,9 +6243,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>
@@ -6115,22 +6253,22 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -6150,44 +6288,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 name="@0@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6203,32 +6341,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 name="@@0@1@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@0@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -6243,9 +6381,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>
@@ -6255,33 +6393,33 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -6312,39 +6450,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -6364,44 +6502,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 name="@1@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6417,32 +6555,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 name="@@1@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -6457,9 +6595,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>
@@ -6469,22 +6607,22 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -6504,44 +6642,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 name="@1@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6557,32 +6695,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 name="@@1@1@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -6597,9 +6735,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>
@@ -6609,33 +6747,33 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -6666,39 +6804,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 name="2" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -6718,44 +6856,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 name="@2@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6771,32 +6909,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 name="@@2@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -6811,9 +6949,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>
@@ -6823,22 +6961,22 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -6858,44 +6996,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 name="@2@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6911,32 +7049,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 name="@@2@1@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -6951,9 +7089,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>
@@ -6963,33 +7101,33 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -7020,9 +7158,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>
@@ -7034,11 +7172,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>
@@ -7047,47 +7185,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -7118,9 +7256,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>
@@ -7128,12 +7266,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -7155,8 +7293,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -7167,26 +7305,26 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="Distance" index="1"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="Distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column width="-1" name="Distance" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7218,17 +7356,17 @@ 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 name="Distance" labelOnTop="0"/>
@@ -7249,7 +7387,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -7322,58 +7460,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -7404,36 +7542,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -7448,44 +7586,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -7508,46 +7646,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="marker" frame_rate="10" alpha="0.796078" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="0.796078">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -7570,15 +7708,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>
@@ -7589,34 +7727,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="8" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidth="0.40000000000000002" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -7631,151 +7769,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="8" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="1" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="1" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="8" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="4" textOpacity="0.90000000000000002" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="227,0,185,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="4" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="227,0,185,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="0.90000000000000002" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.10000000000000001" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeY="0" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0.10000000000000001" shapeRadiiY="0" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -7790,89 +7928,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="1" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="2" minFeatureSize="0" obstacle="0" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="0" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="2" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -7881,145 +8019,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>
@@ -8028,47 +8166,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -8099,9 +8237,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>
@@ -8109,12 +8247,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="10" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -8129,8 +8267,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -8139,8 +8277,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -8149,8 +8287,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -8162,30 +8300,30 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="type" index="2"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="position" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="position" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8261,7 +8399,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="Polygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8336,58 +8474,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -8418,36 +8556,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -8462,44 +8600,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -8522,38 +8660,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -8568,9 +8706,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>
@@ -8581,11 +8719,11 @@ 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 value="name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" 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" value="name" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -8594,47 +8732,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -8665,9 +8803,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>
@@ -8675,12 +8813,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="1" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="1" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -8735,38 +8873,38 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="fence_len" index="4"/>
       </aliases>
       <defaults>
-        <default field="name" expression="" applyOnUpdate="0"/>
-        <default field="group" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="cone_len" expression="" applyOnUpdate="0"/>
-        <default field="fence_len" expression="" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="group" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default expression="" field="fence_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="group" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="cone_len" desc="" exp=""/>
+        <constraint field="fence_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="name" type="field" hidden="0"/>
-          <column width="-1" name="group" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="cone_len" type="field" hidden="0"/>
-          <column width="-1" name="fence_len" type="field" hidden="0"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8798,8 +8936,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="group" labelOnTop="0"/>
@@ -8811,7 +8949,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8876,7 +9014,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8890,25 +9028,25 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field name="fence_len" comment="" precision="0" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" type="6" subType="0"/>
-        <field name="fence_len" comment="" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" type="6" subType="0"/>
-        <field name="cone_len" comment="" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" type="6" subType="0"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" name="fence_len" precision="0" comment="" subType="0" length="-1" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" precision="0" comment="" subType="0" length="-1" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" name="cone_len" precision="0" comment="" subType="0" length="-1" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyDrawingHints="1" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" version="3.8.3-Zanzibar" minScale="1e+08" simplifyDrawingTol="1" labelsEnabled="1" maxScale="0" readOnly="0">
+          <qgis hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" version="3.8.3-Zanzibar" maxScale="0" minScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1" styleCategories="AllStyleCategories" labelsEnabled="1" simplifyAlgorithm="0">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" enableorderby="0" symbollevels="1" type="RuleRenderer">
+            <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible"/>
               </rules>
               <symbols>
-                <symbol name="0" clip_to_extent="1" type="line" force_rhr="0" alpha="1">
+                <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
                   <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
@@ -8928,9 +9066,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>
@@ -8941,62 +9079,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style previewBkgrdColor="#ffffff" fontLetterSpacing="0" blendMode="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" textOpacity="0.8" fontCapitals="0" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" isExpression="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="comment" fontItalic="0">
-                      <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="255,255,0,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.6" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOpacity="0.6" shapeSizeY="1" shapeRadiiX="1"/>
-                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                    <text-style fontSize="11" previewBkgrdColor="#ffffff" multilineHeight="1" fontCapitals="0" fontStrikeout="0" textColor="0,0,0,255" namedStyle="Regular" blendMode="0" isExpression="0" fontWeight="50" textOpacity="0.8" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" useSubstitutions="0" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+                      <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="0.6" shapeRadiiY="1" shapeOpacity="0.6" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="1" shapeRotation="0" shapeSizeType="0"/>
+                      <shadow shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetUnit="MM" shadowUnder="0" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" plussign="0" decimals="3" useMaxLineLengthForAutoWrap="1" wrapChar="" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement distUnits="MM" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" yOffset="0" rotationAngle="0" centroidInside="0" priority="5" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="5" maxCurvedCharAngleIn="25" offsetType="0" maxCurvedCharAngleOut="-25" quadOffset="4" geometryGeneratorType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placement="4" fitInPolygonOnly="0" repeatDistance="0" preserveRotation="1" xOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0"/>
-                    <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" displayAll="1" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="1" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                    <text-format leftDirectionSymbol="&lt;" wrapChar="" reverseDirectionSymbol="0" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                    <placement maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" offsetType="0" geometryGenerator="" fitInPolygonOnly="0" centroidInside="0" quadOffset="4" preserveRotation="1" xOffset="0" repeatDistance="0" repeatDistanceUnits="MM" priority="5" rotationAngle="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="5" placement="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" distUnits="MM" placementFlags="2" centroidWhole="0"/>
+                    <rendering displayAll="1" obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="1" drawLabels="1" obstacleFactor="1" minFeatureSize="0" labelPerPart="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 key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style previewBkgrdColor="#ffffff" fontLetterSpacing="0" blendMode="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontCapitals="0" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="round( $length, 1) || 'm'" fontItalic="0">
-                      <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0"/>
-                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                    <text-style fontSize="12" previewBkgrdColor="#ffffff" multilineHeight="1" fontCapitals="0" fontStrikeout="0" textColor="0,0,0,255" namedStyle="Semibold" blendMode="0" isExpression="1" fontWeight="63" textOpacity="1" fieldName="round( $length, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" useSubstitutions="0" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+                      <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0"/>
+                      <shadow shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetUnit="MM" shadowUnder="0" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" plussign="0" decimals="3" useMaxLineLengthForAutoWrap="1" wrapChar="" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement distUnits="MM" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" yOffset="0" rotationAngle="0" centroidInside="0" priority="5" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="1" maxCurvedCharAngleIn="25" offsetType="0" maxCurvedCharAngleOut="-25" quadOffset="4" geometryGeneratorType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placement="2" fitInPolygonOnly="0" repeatDistance="0" preserveRotation="1" xOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0"/>
-                    <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" displayAll="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                    <text-format leftDirectionSymbol="&lt;" wrapChar="" reverseDirectionSymbol="0" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                    <placement maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" offsetType="0" geometryGenerator="" fitInPolygonOnly="0" centroidInside="0" quadOffset="4" preserveRotation="1" xOffset="0" repeatDistance="0" repeatDistanceUnits="MM" priority="5" rotationAngle="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" distUnits="MM" placementFlags="15" centroidWhole="0"/>
+                    <rendering displayAll="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" labelPerPart="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>
@@ -9004,8 +9142,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -9013,17 +9151,17 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory penColor="#000000" enabled="0" sizeType="MM" barWidth="5" scaleDependency="Area" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" lineSizeType="MM" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" backgroundColor="#ffffff" minScaleDenominator="0" height="15">
-                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" label="" color="#000000"/>
+              <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+            <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <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>
@@ -9126,66 +9264,66 @@ def my_form_open(dialog, layer, feature):
             <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 expression="" field="id" applyOnUpdate="0"/>
+              <default expression="" field="group" applyOnUpdate="0"/>
+              <default expression="" field="comment" applyOnUpdate="0"/>
+              <default expression="" field="moveable" applyOnUpdate="0"/>
+              <default expression="" field="type" applyOnUpdate="0"/>
+              <default expression="" field="name" applyOnUpdate="0"/>
+              <default expression="" field="hidden" applyOnUpdate="0"/>
+              <default expression="" field="auxiliary_storage_labeling_positiony" applyOnUpdate="0"/>
+              <default expression="" field="auxiliary_storage_labeling_positionx" applyOnUpdate="0"/>
+              <default expression="" field="fence_len" applyOnUpdate="0"/>
+              <default expression="" field="cone_len" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="comment" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="moveable" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="hidden" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
             </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 field="id" desc="" exp=""/>
+              <constraint field="group" desc="" exp=""/>
+              <constraint field="comment" desc="" exp=""/>
+              <constraint field="moveable" desc="" exp=""/>
+              <constraint field="type" desc="" exp=""/>
+              <constraint field="name" desc="" exp=""/>
+              <constraint field="hidden" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positiony" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positionx" desc="" exp=""/>
+              <constraint field="fence_len" desc="" exp=""/>
+              <constraint field="cone_len" desc="" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field name="fence_len" comment="" precision="0" length="-1" typeName="double precision" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" type="6" subType="0"/>
-              <field name="fence_len" comment="" precision="0" length="-1" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" type="6" subType="0"/>
-              <field name="cone_len" comment="" precision="0" length="-1" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" type="6" subType="0"/>
+              <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" name="fence_len" precision="0" subType="0" comment="" length="-1" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" precision="0" subType="0" comment="" length="-1" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" name="cone_len" precision="0" subType="0" comment="" length="-1" type="6"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
             <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
               <columns>
-                <column width="-1" name="id" type="field" hidden="0"/>
-                <column width="-1" name="group" type="field" hidden="0"/>
-                <column width="-1" type="actions" hidden="1"/>
-                <column width="223" name="comment" type="field" hidden="0"/>
-                <column width="-1" name="moveable" type="field" hidden="0"/>
-                <column width="-1" name="type" type="field" hidden="0"/>
-                <column width="414" name="name" type="field" hidden="0"/>
-                <column width="-1" name="hidden" type="field" hidden="0"/>
-                <column width="-1" name="fence_len" type="field" hidden="0"/>
-                <column width="-1" name="cone_len" type="field" hidden="0"/>
-                <column width="-1" name="auxiliary_storage_labeling_positiony" type="field" hidden="1"/>
-                <column width="-1" name="auxiliary_storage_labeling_positionx" type="field" hidden="1"/>
+                <column width="-1" name="id" hidden="0" type="field"/>
+                <column width="-1" name="group" hidden="0" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" name="comment" hidden="0" type="field"/>
+                <column width="-1" name="moveable" hidden="0" type="field"/>
+                <column width="-1" name="type" hidden="0" type="field"/>
+                <column width="414" name="name" hidden="0" type="field"/>
+                <column width="-1" name="hidden" hidden="0" type="field"/>
+                <column width="-1" name="fence_len" hidden="0" type="field"/>
+                <column width="-1" name="cone_len" hidden="0" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -9216,18 +9354,18 @@ 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 name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
@@ -9258,58 +9396,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9340,36 +9478,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -9384,44 +9522,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9444,64 +9582,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 forceraster="0" enableorderby="0" symbollevels="1" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="1" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" label="Show in fencing maps">
-            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones"/>
-            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences"/>
-            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences"/>
-            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')" label="Construction" checkstate="0"/>
+          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
+            <rule filter="regexp_match(&quot;type&quot;, '^cone')" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" label="Cones"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" label="Moveable fences"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" label="Fixed fences"/>
+            <rule checkstate="0" filter="regexp_match(&quot;type&quot;, '^constr')" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" label="Construction"/>
           </rule>
-          <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Is Visible" checkstate="0"/>
+          <rule checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="4" label="Is Visible"/>
           <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9532,56 +9670,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9612,56 +9750,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 name="2" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9692,56 +9830,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 name="3" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9772,56 +9910,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 name="4" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9852,50 +9990,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 name="5" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9926,9 +10064,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>
@@ -9937,34 +10075,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
-          <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" textOpacity="0.80000000000000004" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="comment" fontItalic="0">
+              <text-style fontSize="11" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Regular" blendMode="0" isExpression="0" allowHtml="0" fontWeight="50" textOpacity="0.80000000000000004" forcedItalic="0" forcedBold="0" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="255,255,0,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.59999999999999998" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeSizeY="1" shapeRadiiX="1">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="0.59999999999999998" shapeRadiiY="1" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="1" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -9979,110 +10117,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"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="5" lineAnchorTextPoint="CenterOfText" priority="5" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="14" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="2" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1.8200000000000001" mergeLines="1" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="2" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="5" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="14" polygonPlacementFlags="2" priority="5" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="1" drawLabels="1" obstacleFactor="1.8200000000000001" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{226e1338-ed15-4fc8-a035-fefee03c38d6}">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="round( $length, 1) || 'm'" fontItalic="0">
+              <text-style fontSize="11" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="round( $length, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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 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"/>
@@ -10097,88 +10235,88 @@ 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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="4294967295" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="1" lineAnchorTextPoint="CenterOfText" priority="6" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="14" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="2" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="2" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="14" polygonPlacementFlags="2" priority="6" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -10187,11 +10325,11 @@ 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="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>
@@ -10200,47 +10338,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -10271,9 +10409,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>
@@ -10281,12 +10419,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -10373,58 +10511,58 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="cone_len" index="8"/>
       </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="fence_len" expression="" applyOnUpdate="0"/>
-        <default field="cone_len" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="group" applyOnUpdate="0"/>
+        <default expression="" field="comment" applyOnUpdate="0"/>
+        <default expression="" field="moveable" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="hidden" applyOnUpdate="0"/>
+        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <default expression="" field="cone_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="comment" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="moveable" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="hidden" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="group" desc="" exp=""/>
+        <constraint field="comment" desc="" exp=""/>
+        <constraint field="moveable" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="hidden" desc="" exp=""/>
+        <constraint field="fence_len" desc="" exp=""/>
+        <constraint field="cone_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="fence_len" comment="" precision="0" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" type="6" subType="0"/>
-        <field name="fence_len" comment="" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" type="6" subType="0"/>
-        <field name="cone_len" comment="" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" type="6" subType="0"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" name="fence_len" precision="0" comment="" subType="0" length="-1" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" precision="0" comment="" subType="0" length="-1" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" name="cone_len" precision="0" comment="" subType="0" length="-1" type="6"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="group" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="373" name="comment" type="field" hidden="0"/>
-          <column width="-1" name="moveable" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="692" name="name" type="field" hidden="0"/>
-          <column width="-1" name="hidden" type="field" hidden="0"/>
-          <column width="-1" name="fence_len" type="field" hidden="0"/>
-          <column width="-1" name="cone_len" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="373" name="comment" hidden="0" type="field"/>
+          <column width="-1" name="moveable" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="692" name="name" hidden="0" type="field"/>
+          <column width="-1" name="hidden" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10456,18 +10594,18 @@ 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 name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
@@ -10489,7 +10627,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10562,58 +10700,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -10644,36 +10782,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -10688,44 +10826,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -10748,54 +10886,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -10826,9 +10964,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>
@@ -10839,11 +10977,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>
@@ -10852,47 +10990,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -10923,9 +11061,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>
@@ -10933,12 +11071,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -10961,22 +11099,22 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="id" index="0"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11008,7 +11146,7 @@ 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 name="id" labelOnTop="0"/>
@@ -11019,17 +11157,17 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiPolygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.94678832168284544</ymin>
-        <xmax>18.42124635930919041</xmax>
+        <ymin>-33.95934132149262297</ymin>
+        <xmax>18.42432608246585701</xmax>
         <ymax>-33.8965939968351222</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.94678832168284544</ymin>
-        <xmax>18.42124635930919041</xmax>
+        <ymin>-33.95934132149262297</ymin>
+        <xmax>18.42432608246585701</xmax>
         <ymax>-33.8965939968351222</ymax>
       </wgs84extent>
       <id>marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51</id>
@@ -11092,58 +11230,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -11174,36 +11312,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -11218,44 +11356,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -11278,38 +11416,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -11324,9 +11462,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>
@@ -11337,11 +11475,15 @@ 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;id&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" 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>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -11350,47 +11492,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -11421,9 +11563,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>
@@ -11431,18 +11573,18 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <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>
@@ -11457,8 +11599,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -11467,8 +11609,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -11477,43 +11619,55 @@ def my_form_open(dialog, layer, feature):
           <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 name="day" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias name="" field="id" index="0"/>
         <alias name="" field="type" index="1"/>
         <alias name="" field="page" index="2"/>
+        <alias name="" field="day" index="3"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="page" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="page" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="page" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="page" type="field" hidden="0"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="page" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11545,9 +11699,9 @@ 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 name="id" labelOnTop="0"/>
@@ -11560,7 +11714,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -11625,7 +11779,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11636,12 +11790,13 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join editable="0" memoryCache="1" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" upsertOnEdit="0" joinFieldName="position" customPrefix="csv_" hasCustomPrefix="1" cascadedDelete="0" dynamicForm="0">
+        <join memoryCache="0" joinFieldName="position" dynamicForm="0" cascadedDelete="0" targetFieldName="position" editable="0" customPrefix="csv_" hasCustomPrefix="1" upsertOnEdit="0" joinLayerId="marshals_by_position20161003112326575">
           <joinFieldsSubset>
+            <field name="position"/>
             <field name="club"/>
-            <field name="name"/>
-            <field name="captain"/>
-            <field name="captain_phone"/>
+            <field name="firstname"/>
+            <field name="surname"/>
+            <field name="days"/>
             <field name="first_runner"/>
             <field name="last_runner"/>
             <field name="instructions"/>
@@ -11662,58 +11817,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="id" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -11744,36 +11899,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -11788,44 +11943,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -11848,54 +12003,55 @@ 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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Show in marshal overview"/>
-          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview" symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )" label="Show in marshal maps"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" symbol="0" label="Always show in marshal overview" description="Show in marshal overview"/>
+          <rule checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="1" label="Show in marshal overview" description="Show in marshal overview"/>
+          <rule checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="2" label="Show in marshal maps" description="Show in marshal overview"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="marker" frame_rate="10" alpha="0.792157" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="0.792157">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option 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">
               <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="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,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"/>
-              <prop v="0,0,0,255" k="color"/>
+              <prop v="255,255,255,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
               <prop v="bevel" k="joinstyle"/>
               <prop v="circle" k="name"/>
@@ -11904,52 +12060,110 @@ def my_form_open(dialog, layer, feature):
               <prop v="MM" k="offset_unit"/>
               <prop v="0,0,0,255" k="outline_color"/>
               <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
+              <prop v="0.2" k="outline_width"/>
               <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
               <prop v="MM" k="outline_width_unit"/>
               <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
+              <prop v="5" k="size"/>
               <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
+              <prop v="Pixel" k="size_unit"/>
               <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 name="1" clip_to_extent="1" type="marker" frame_rate="10" alpha="0.01" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="0.792157">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option 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">
               <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="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"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <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="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="Pixel" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
+              <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>
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="0.01">
+            <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 locked="0" pass="1" class="SimpleMarker" enabled="1">
+              <Option type="Map">
+                <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"/>
@@ -11972,9 +12186,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>
@@ -11982,35 +12196,35 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{3100b6d3-183a-45b5-94f5-2ae25cc59226}">
-          <rule key="{26c6b0ec-ed26-401f-abd2-72394fe7d58d}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="'marshal plan' = attribute( @atlas_feature , 'type' )">
+        <rules key="{782e8913-173c-49d0-a55a-d546e6ab18ac}">
+          <rule active="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{27576711-5c81-4f5e-b709-39937077f10b}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" textOpacity="0.90000000000000002" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="6" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="0.90000000000000002" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.10000000000000001" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeY="0" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0.10000000000000001" shapeRadiiY="0" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -12025,121 +12239,121 @@ 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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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="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>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="1" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="2" minFeatureSize="0" obstacle="0" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="0" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="2" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{98b8f830-3256-405e-9a42-27279b9826d4}" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{4a6c81c3-8777-4e43-8e37-1529c8f0e84e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" textOpacity="0.5" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="6" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="0.5" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidth="0.40000000000000002" shapeRadiiY="0" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -12154,181 +12368,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="8" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="5" minFeatureSize="0" obstacle="0" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1.8" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="1" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="8" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="0" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="5" mergeLines="0" drawLabels="1" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{99221fb4-413e-4f4d-b076-d6c2768a862d}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" key="{56b5884e-da69-4fbd-bdc6-c77f1ac895e4}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" textOpacity="0.59999999999999998" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="6" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Regular" blendMode="0" isExpression="0" allowHtml="0" fontWeight="50" textOpacity="0.59999999999999998" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidth="0.40000000000000002" shapeRadiiY="0" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -12343,181 +12557,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="8" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="5" minFeatureSize="0" obstacle="0" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1.8" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="1" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="8" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="0" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="5" mergeLines="0" drawLabels="1" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{85065de1-e51c-4c04-9292-536cbccc7aba}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{1e6946de-3bec-4a18-b88c-f6b89100ed3e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" textOpacity="0.90000000000000002" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="8" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="0.90000000000000002" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeFillColor="255,255,0,255" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.90000000000000002" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidth="0.40000000000000002" shapeRadiiY="0" shapeOpacity="0.90000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,0,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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,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"/>
@@ -12532,149 +12746,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="0" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="10" minFeatureSize="0" obstacle="0" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1.8" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="1" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="0" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="10" mergeLines="0" drawLabels="1" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -12683,151 +12897,153 @@ 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="dualview/previewExpressions" type="StringList">
+          <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 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>
@@ -12836,47 +13052,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -12907,9 +13123,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>
@@ -12917,12 +13133,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -12937,8 +13153,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -12947,8 +13163,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -12957,8 +13173,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -12967,8 +13183,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -12977,46 +13193,50 @@ def my_form_open(dialog, layer, feature):
           <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 name="csv_position" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <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 name="csv_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>
-            </config>
-          </editWidget>
-        </field>
-        <field name="csv_captain" configurationFlags="None">
+        <field name="csv_firstname" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_captain_phone" configurationFlags="None">
+        <field name="csv_surname" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
+        <field name="csv_days" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="csv_first_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
@@ -13045,75 +13265,80 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="type" index="2"/>
         <alias name="" field="notes" index="3"/>
         <alias name="" field="xyposition" index="4"/>
-        <alias name="" field="csv_club" index="5"/>
-        <alias name="" field="csv_name" index="6"/>
-        <alias name="" field="csv_captain" index="7"/>
-        <alias name="" field="csv_captain_phone" index="8"/>
-        <alias name="" field="csv_first_runner" index="9"/>
-        <alias name="" field="csv_last_runner" index="10"/>
-        <alias name="" field="csv_instructions" index="11"/>
+        <alias name="" field="csv_position" index="5"/>
+        <alias name="" field="csv_club" index="6"/>
+        <alias name="" field="csv_firstname" index="7"/>
+        <alias name="" field="csv_surname" index="8"/>
+        <alias name="" field="csv_days" index="9"/>
+        <alias name="" field="csv_first_runner" index="10"/>
+        <alias name="" field="csv_last_runner" index="11"/>
+        <alias name="" field="csv_instructions" index="12"/>
       </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="csv_club" expression="" applyOnUpdate="0"/>
-        <default field="csv_name" expression="" applyOnUpdate="0"/>
-        <default field="csv_captain" expression="" applyOnUpdate="0"/>
-        <default field="csv_captain_phone" expression="" applyOnUpdate="0"/>
-        <default field="csv_first_runner" expression="" applyOnUpdate="0"/>
-        <default field="csv_last_runner" expression="" applyOnUpdate="0"/>
-        <default field="csv_instructions" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="notes" applyOnUpdate="0"/>
+        <default expression="" field="xyposition" applyOnUpdate="0"/>
+        <default expression="" field="csv_position" applyOnUpdate="0"/>
+        <default expression="" field="csv_club" applyOnUpdate="0"/>
+        <default expression="" field="csv_firstname" applyOnUpdate="0"/>
+        <default expression="" field="csv_surname" applyOnUpdate="0"/>
+        <default expression="" field="csv_days" applyOnUpdate="0"/>
+        <default expression="" field="csv_first_runner" applyOnUpdate="0"/>
+        <default expression="" field="csv_last_runner" applyOnUpdate="0"/>
+        <default expression="" field="csv_instructions" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="notes" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="xyposition" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_club" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_captain" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_captain_phone" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_first_runner" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_last_runner" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_instructions" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="notes" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="xyposition" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_club" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_firstname" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_surname" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_days" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_first_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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="csv_club" exp="" desc=""/>
-        <constraint field="csv_name" exp="" desc=""/>
-        <constraint field="csv_captain" exp="" desc=""/>
-        <constraint field="csv_captain_phone" exp="" desc=""/>
-        <constraint field="csv_first_runner" exp="" desc=""/>
-        <constraint field="csv_last_runner" exp="" desc=""/>
-        <constraint field="csv_instructions" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="notes" desc="" exp=""/>
+        <constraint field="xyposition" desc="" exp=""/>
+        <constraint field="csv_position" desc="" exp=""/>
+        <constraint field="csv_club" desc="" exp=""/>
+        <constraint field="csv_firstname" desc="" exp=""/>
+        <constraint field="csv_surname" desc="" exp=""/>
+        <constraint field="csv_days" desc="" exp=""/>
+        <constraint field="csv_first_runner" desc="" exp=""/>
+        <constraint field="csv_last_runner" desc="" exp=""/>
+        <constraint field="csv_instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="position" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="notes" type="field" hidden="0"/>
-          <column width="-1" name="xyposition" type="field" hidden="0"/>
-          <column width="-1" name="csv_name" type="field" hidden="0"/>
-          <column width="-1" name="csv_club" type="field" hidden="0"/>
-          <column width="-1" name="csv_captain" type="field" hidden="0"/>
-          <column width="-1" name="csv_captain_phone" type="field" hidden="0"/>
-          <column width="-1" name="csv_first_runner" type="field" hidden="0"/>
-          <column width="-1" name="csv_last_runner" type="field" hidden="0"/>
-          <column width="-1" name="csv_instructions" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="notes" hidden="0" type="field"/>
+          <column width="-1" name="xyposition" hidden="0" type="field"/>
+          <column width="-1" name="csv_club" hidden="0" type="field"/>
+          <column width="-1" name="csv_first_runner" hidden="0" type="field"/>
+          <column width="-1" name="csv_last_runner" hidden="0" type="field"/>
+          <column width="-1" name="csv_firstname" hidden="0" type="field"/>
+          <column width="-1" name="csv_surname" hidden="0" type="field"/>
+          <column width="-1" name="csv_position" hidden="0" type="field"/>
+          <column width="-1" name="csv_days" hidden="0" type="field"/>
+          <column width="-1" name="csv_instructions" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13145,37 +13370,39 @@ 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_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <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="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 name="csv_10_distance" labelOnTop="0"/>
@@ -13184,9 +13411,11 @@ def my_form_open(dialog, layer, feature):
         <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"/>
@@ -13210,7 +13439,28 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
         <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="csv_captain"/>
+        <field reuseLastValue="0" name="csv_captain_email"/>
+        <field reuseLastValue="0" name="csv_captain_phone"/>
+        <field reuseLastValue="0" name="csv_club"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
         <widget name="csv_captain_ph">
@@ -13259,7 +13509,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" geometry="No geometry" legendPlaceholderImage="" autoRefreshTime="0" autoRefreshEnabled="0" type="vector" maxScale="100000" readOnly="0" refreshOnNotifyEnabled="0" wkbType="NoGeometry">
+    <maplayer hasScaleBasedVisibilityFlag="0" readOnly="0" autoRefreshEnabled="0" maxScale="100000" minScale="1e+08" autoRefreshTime="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" geometry="No geometry" type="vector" legendPlaceholderImage="" wkbType="NoGeometry">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -13312,7 +13562,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13325,8 +13575,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="marshal_positions20160930121322287"/>
         <layer id="all_routes20170907054841602"/>
+        <layer id="marshal_positions20160930121322287"/>
       </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
@@ -13340,58 +13590,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -13422,36 +13672,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -13466,44 +13716,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -13526,9 +13776,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>
@@ -13537,11 +13787,11 @@ 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>
@@ -13557,8 +13807,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13567,8 +13817,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13591,8 +13841,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13601,8 +13851,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13611,8 +13861,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13621,8 +13871,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13641,12 +13891,19 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="days" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <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>
@@ -13684,80 +13941,84 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="captain" index="7"/>
         <alias name="" field="captain_phone" index="8"/>
         <alias name="" field="captain_email" index="9"/>
-        <alias name="" field="races" index="10"/>
-        <alias name="" field="first_runner" index="11"/>
-        <alias name="" field="last_runner" index="12"/>
-        <alias name="" field="instructions" index="13"/>
+        <alias name="" field="days" index="10"/>
+        <alias name="" field="races" index="11"/>
+        <alias name="" field="first_runner" index="12"/>
+        <alias name="" field="last_runner" index="13"/>
+        <alias name="" field="instructions" index="14"/>
       </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="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 expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="club" applyOnUpdate="0"/>
+        <default expression="" field="firstname" applyOnUpdate="0"/>
+        <default expression="" field="surname" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="phone" applyOnUpdate="0"/>
+        <default expression="" field="email" applyOnUpdate="0"/>
+        <default expression="" field="captain" applyOnUpdate="0"/>
+        <default expression="" field="captain_phone" applyOnUpdate="0"/>
+        <default expression="" field="captain_email" applyOnUpdate="0"/>
+        <default expression="" field="days" applyOnUpdate="0"/>
+        <default expression="" field="races" applyOnUpdate="0"/>
+        <default expression="" field="first_runner" applyOnUpdate="0"/>
+        <default expression="" field="last_runner" applyOnUpdate="0"/>
+        <default expression="" field="instructions" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="club" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="firstname" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="surname" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="phone" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="email" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="captain" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="captain_phone" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="captain_email" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="races" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="first_runner" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="last_runner" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="instructions" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="club" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="firstname" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="surname" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="phone" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="email" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="captain" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="captain_phone" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="captain_email" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="days" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="races" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="first_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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="races" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="club" desc="" exp=""/>
+        <constraint field="firstname" desc="" exp=""/>
+        <constraint field="surname" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="phone" desc="" exp=""/>
+        <constraint field="email" desc="" exp=""/>
+        <constraint field="captain" desc="" exp=""/>
+        <constraint field="captain_phone" desc="" exp=""/>
+        <constraint field="captain_email" desc="" exp=""/>
+        <constraint field="days" desc="" exp=""/>
+        <constraint field="races" desc="" exp=""/>
+        <constraint field="first_runner" desc="" exp=""/>
+        <constraint field="last_runner" desc="" exp=""/>
+        <constraint field="instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="position" type="field" hidden="0"/>
-          <column width="221" name="name" type="field" hidden="0"/>
-          <column width="-1" name="club" type="field" hidden="0"/>
-          <column width="-1" name="phone" type="field" hidden="0"/>
-          <column width="-1" name="email" type="field" hidden="0"/>
-          <column width="-1" name="captain" type="field" hidden="0"/>
-          <column width="-1" name="races" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="first_runner" type="field" hidden="0"/>
-          <column width="-1" name="last_runner" type="field" hidden="0"/>
-          <column width="-1" name="instructions" type="field" hidden="0"/>
-          <column width="-1" name="firstname" type="field" hidden="0"/>
-          <column width="-1" name="surname" type="field" hidden="0"/>
-          <column width="-1" name="captain_phone" type="field" hidden="0"/>
-          <column width="-1" name="captain_email" type="field" hidden="0"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="221" name="name" hidden="0" type="field"/>
+          <column width="-1" name="club" hidden="0" type="field"/>
+          <column width="-1" name="phone" hidden="0" type="field"/>
+          <column width="-1" name="email" hidden="0" type="field"/>
+          <column width="-1" name="captain" hidden="0" type="field"/>
+          <column width="-1" name="races" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="first_runner" hidden="0" type="field"/>
+          <column width="-1" name="last_runner" hidden="0" type="field"/>
+          <column width="-1" name="instructions" hidden="0" type="field"/>
+          <column width="-1" name="firstname" hidden="0" type="field"/>
+          <column width="-1" name="surname" hidden="0" type="field"/>
+          <column width="-1" name="captain_phone" hidden="0" type="field"/>
+          <column width="-1" name="captain_email" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13789,23 +14050,23 @@ 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 name="10_distance" labelOnTop="0"/>
@@ -13832,7 +14093,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13897,7 +14158,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13922,58 +14183,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14004,36 +14265,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -14048,44 +14309,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14108,58 +14369,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" filter="&quot;type&quot; IS 'car'" label="Car"/>
-          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14190,50 +14451,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14264,30 +14525,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">
               <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"/>
@@ -14307,33 +14568,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 name="@1@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -14349,32 +14610,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 name="@@1@1@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -14389,9 +14650,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>
@@ -14404,11 +14665,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>
@@ -14417,47 +14678,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -14488,9 +14749,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>
@@ -14498,12 +14759,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -14534,26 +14795,26 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="type" index="1"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14585,8 +14846,8 @@ 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 name="id" labelOnTop="0"/>
@@ -14598,7 +14859,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14663,7 +14924,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14688,58 +14949,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14770,36 +15031,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -14814,44 +15075,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14874,44 +15135,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 symbollevels="0" referencescale="-1" type="nullSymbol" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8.5" textOpacity="0.75" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="name" fontItalic="0">
+          <text-style fontSize="8.5" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Regular" blendMode="0" isExpression="0" allowHtml="0" fontWeight="50" textOpacity="0.75" forcedItalic="0" forcedBold="0" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1.5" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1.5" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -14926,109 +15187,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="1" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="2" centroidWhole="0" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="0.20000000000000001" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="4" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="2" polygonPlacementFlags="2" priority="1" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="0.20000000000000001" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -15037,47 +15298,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -15108,9 +15369,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>
@@ -15118,12 +15379,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -15138,8 +15399,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15148,8 +15409,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15158,8 +15419,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15168,8 +15429,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15178,8 +15439,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15188,8 +15449,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15198,8 +15459,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15208,8 +15469,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15218,8 +15479,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15237,54 +15498,54 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="label_rota" index="8"/>
       </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 expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="osm_id" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="z_order" applyOnUpdate="0"/>
+        <default expression="" field="population" applyOnUpdate="0"/>
+        <default expression="" field="label_x" applyOnUpdate="0"/>
+        <default expression="" field="label_y" applyOnUpdate="0"/>
+        <default expression="" field="label_rota" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="osm_id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="z_order" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="population" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_x" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_y" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_rota" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="population" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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 field="id" desc="" exp=""/>
+        <constraint field="osm_id" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="z_order" desc="" exp=""/>
+        <constraint field="population" desc="" exp=""/>
+        <constraint field="label_x" desc="" exp=""/>
+        <constraint field="label_y" desc="" exp=""/>
+        <constraint field="label_rota" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="osm_id" type="field" hidden="0"/>
-          <column width="-1" name="name" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="z_order" type="field" hidden="0"/>
-          <column width="-1" name="population" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="label_x" type="field" hidden="0"/>
-          <column width="-1" name="label_y" type="field" hidden="0"/>
-          <column width="-1" name="label_rota" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" name="population" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15316,15 +15577,15 @@ 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 name="id" labelOnTop="0"/>
@@ -15343,7 +15604,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -15408,7 +15669,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15433,58 +15694,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -15515,36 +15776,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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,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"/>
@@ -15559,44 +15820,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -15619,52 +15880,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 symbollevels="0" referencescale="-1" type="nullSymbol" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="7" textOpacity="0.80000000000000004" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontItalic="0">
+          <text-style fontSize="7" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Regular" blendMode="0" isExpression="1" allowHtml="0" fontWeight="50" textOpacity="0.80000000000000004" forcedItalic="0" forcedBold="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="markerSymbol" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="markerSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -15687,34 +15948,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 name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -15729,114 +15990,116 @@ 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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="3" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MapUnit" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="4" centroidWhole="0" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="3" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="LineGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="5" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="0.29999999999999999" mergeLines="1" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="LineGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="4" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="3" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MapUnit" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="4" polygonPlacementFlags="2" priority="3" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="1" drawLabels="1" obstacleFactor="0.29999999999999999" minFeatureSize="5" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option 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>
@@ -15845,47 +16108,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -15916,9 +16179,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>
@@ -15926,12 +16189,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -15946,8 +16209,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15956,8 +16219,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -16001,8 +16264,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -16083,82 +16346,82 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="auxiliary_storage_labeling_show" index="15"/>
       </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 expression="" field="osm_id" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="highway" applyOnUpdate="0"/>
+        <default expression="" field="waterway" applyOnUpdate="0"/>
+        <default expression="" field="aerialway" applyOnUpdate="0"/>
+        <default expression="" field="barrier" applyOnUpdate="0"/>
+        <default expression="" field="man_made" applyOnUpdate="0"/>
+        <default expression="" field="z_order" applyOnUpdate="0"/>
+        <default expression="" field="other_tags" applyOnUpdate="0"/>
+        <default expression="" field="never_show" applyOnUpdate="0"/>
+        <default expression="" field="label_x" applyOnUpdate="0"/>
+        <default expression="" field="label_y" applyOnUpdate="0"/>
+        <default expression="" field="label_rota" applyOnUpdate="0"/>
+        <default expression="" field="always_sho" applyOnUpdate="0"/>
+        <default expression="" field="resident_a" applyOnUpdate="0"/>
+        <default expression="" field="auxiliary_storage_labeling_show" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="osm_id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="highway" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="waterway" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="aerialway" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="barrier" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="man_made" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="z_order" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="other_tags" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="never_show" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_x" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_y" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_rota" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="always_sho" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="resident_a" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="auxiliary_storage_labeling_show" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="highway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="waterway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="aerialway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="barrier" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="man_made" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="other_tags" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="never_show" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="always_sho" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="resident_a" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="auxiliary_storage_labeling_show" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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 field="osm_id" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="highway" desc="" exp=""/>
+        <constraint field="waterway" desc="" exp=""/>
+        <constraint field="aerialway" desc="" exp=""/>
+        <constraint field="barrier" desc="" exp=""/>
+        <constraint field="man_made" desc="" exp=""/>
+        <constraint field="z_order" desc="" exp=""/>
+        <constraint field="other_tags" desc="" exp=""/>
+        <constraint field="never_show" desc="" exp=""/>
+        <constraint field="label_x" desc="" exp=""/>
+        <constraint field="label_y" desc="" exp=""/>
+        <constraint field="label_rota" desc="" exp=""/>
+        <constraint field="always_sho" desc="" exp=""/>
+        <constraint field="resident_a" desc="" exp=""/>
+        <constraint field="auxiliary_storage_labeling_show" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column width="-1" name="osm_id" type="field" hidden="0"/>
-          <column width="160" name="name" type="field" hidden="0"/>
-          <column width="-1" name="z_order" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="highway" type="field" hidden="0"/>
-          <column width="-1" name="waterway" type="field" hidden="0"/>
-          <column width="-1" name="aerialway" type="field" hidden="0"/>
-          <column width="-1" name="barrier" type="field" hidden="0"/>
-          <column width="-1" name="man_made" type="field" hidden="0"/>
-          <column width="142" name="other_tags" type="field" hidden="0"/>
-          <column width="-1" name="never_show" type="field" hidden="0"/>
-          <column width="-1" name="label_x" type="field" hidden="0"/>
-          <column width="-1" name="label_y" type="field" hidden="0"/>
-          <column width="-1" name="label_rota" type="field" hidden="0"/>
-          <column width="-1" name="always_sho" type="field" hidden="0"/>
-          <column width="-1" name="resident_a" type="field" hidden="0"/>
-          <column width="-1" name="auxiliary_storage_labeling_show" type="field" hidden="0"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="160" name="name" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="highway" hidden="0" type="field"/>
+          <column width="-1" name="waterway" hidden="0" type="field"/>
+          <column width="-1" name="aerialway" hidden="0" type="field"/>
+          <column width="-1" name="barrier" hidden="0" type="field"/>
+          <column width="-1" name="man_made" hidden="0" type="field"/>
+          <column width="142" name="other_tags" hidden="0" type="field"/>
+          <column width="-1" name="never_show" hidden="0" type="field"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column width="-1" name="always_sho" hidden="0" type="field"/>
+          <column width="-1" name="resident_a" hidden="0" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16190,40 +16453,40 @@ 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 name="aerialway" labelOnTop="0"/>
@@ -16327,7 +16590,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -16392,7 +16655,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16417,58 +16680,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16499,36 +16762,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -16543,44 +16806,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16603,54 +16866,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <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'"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0"/>
+          <rule filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1"/>
+          <rule filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" symbol="2"/>
+          <rule filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}" symbol="3"/>
+          <rule filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" symbol="4"/>
+          <rule filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16673,47 +16936,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 name="1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16735,47 +16998,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 name="2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16797,57 +17060,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 name="3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16869,47 +17132,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 name="4" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16932,18 +17195,18 @@ def my_form_open(dialog, layer, feature):
               <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"/>
@@ -16960,24 +17223,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"/>
@@ -17000,10 +17263,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"/>
@@ -17012,18 +17275,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"/>
@@ -17040,24 +17303,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"/>
@@ -17081,47 +17344,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 name="5" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -17143,15 +17406,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>
@@ -17160,32 +17423,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="0.90000000000000002" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="name" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="0.90000000000000002" forcedItalic="0" forcedBold="0" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="2" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="2" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.69999999999999996" shapeSizeY="1" shapeRadiiX="2">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferSize="2" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="2" shapeOpacity="0.69999999999999996" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="1" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -17200,99 +17463,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="3" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="2" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="0" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="3" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="10" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1.8" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="2" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="2" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="3" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="3" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="10" mergeLines="0" drawLabels="1" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -17301,47 +17564,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -17372,9 +17635,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>
@@ -17382,12 +17645,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -17434,34 +17697,34 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="distance" index="3"/>
       </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 expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="name" type="field" hidden="0"/>
-          <column width="-1" name="distance" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17493,10 +17756,10 @@ 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 name="distance" labelOnTop="0"/>
@@ -17510,7 +17773,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiPolygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -17583,58 +17846,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -17665,36 +17928,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -17709,44 +17972,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -17769,42 +18032,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -17823,48 +18086,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 name="@0@0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -17895,9 +18158,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>
@@ -17905,17 +18168,17 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <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="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"/>
@@ -17930,9 +18193,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>
@@ -17943,11 +18206,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>
@@ -17956,47 +18219,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -18027,9 +18290,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>
@@ -18037,12 +18300,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="1" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="1" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -18065,23 +18328,23 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="FID" index="0"/>
       </aliases>
       <defaults>
-        <default field="FID" expression="" applyOnUpdate="0"/>
+        <default expression="" field="FID" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="FID" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="FID" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint field="FID" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="431" name="type" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="431" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18113,8 +18376,8 @@ 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 name="id" labelOnTop="0"/>
@@ -18126,7 +18389,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -18191,7 +18454,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18216,58 +18479,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18298,36 +18561,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -18342,44 +18605,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18402,61 +18665,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" filter="&quot;status&quot; = 'open'" label="Road Open"/>
-          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" filter="&quot;status&quot; = 'no-parking'" label="No Parking"/>
-          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed"/>
-          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" filter="&quot;status&quot; = 'one-way'" label="One-Way"/>
-          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" filter="&quot;status&quot; = 'closure'" label="Road Closures"/>
+          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" label="Road Open"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" label="No Parking"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" label="Lane Closed"/>
+          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" label="One-Way"/>
+          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" label="Road Closures"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18487,50 +18750,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18550,40 +18813,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 name="@1@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -18606,52 +18869,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 name="2" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18682,41 +18945,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">
               <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"/>
@@ -18736,46 +18999,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 name="@2@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -18798,58 +19061,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 name="3" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18880,41 +19143,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">
               <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"/>
@@ -18934,46 +19197,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 name="@3@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -18996,58 +19259,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 name="4" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -19078,20 +19341,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>
@@ -19100,32 +19363,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="9" textOpacity="1" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="times" fontItalic="0">
+          <text-style fontSize="9" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Regular" blendMode="0" isExpression="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="times" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -19140,67 +19403,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="5" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="2" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="4" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="2" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="5" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -19209,47 +19472,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -19280,9 +19543,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>
@@ -19290,12 +19553,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -19342,34 +19605,34 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="times" index="3"/>
       </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 expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="status" applyOnUpdate="0"/>
+        <default expression="" field="times" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="status" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="times" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="status" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="times" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="status" desc="" exp=""/>
+        <constraint field="times" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="202" name="type" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="status" type="field" hidden="0"/>
-          <column width="-1" name="times" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="202" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="status" hidden="0" type="field"/>
+          <column width="-1" name="times" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19401,10 +19664,10 @@ 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 name="id" labelOnTop="0"/>
@@ -19418,21 +19681,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
-        <xmin>18.37541576228521834</xmin>
-        <ymin>-33.95567171312350752</ymin>
-        <xmax>18.42201008438910748</xmax>
-        <ymax>-33.90011331441002085</ymax>
+        <xmin>18.37543911768802474</xmin>
+        <ymin>-33.95582126985814853</ymin>
+        <xmax>18.42275999405387665</xmax>
+        <ymax>-33.90013265894425842</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37541576228521834</xmin>
-        <ymin>-33.95567171312350752</ymin>
-        <xmax>18.42201008438910748</xmax>
-        <ymax>-33.90011331441002085</ymax>
+        <xmin>18.37543911768802474</xmin>
+        <ymin>-33.95582126985814853</ymin>
+        <xmax>18.42275999405387665</xmax>
+        <ymax>-33.90013265894425842</ymax>
       </wgs84extent>
-      <id>route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)</datasource>
+      <id>route_markers_6943d827_bf32_40af_988d_60a736c1d3e1</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(4,0)</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -19457,15 +19720,6 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -19482,15 +19736,7 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
+        <extent/>
       </resourceMetadata>
       <provider encoding="">memory</provider>
       <vectorjoins/>
@@ -19508,58 +19754,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -19590,36 +19836,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -19634,44 +19880,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -19694,54 +19940,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 symbollevels="0" referencescale="-1" type="nullSymbol" forceraster="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{0ffa6f3f-6f8e-491c-81ad-015a65f39b56}">
-          <rule key="{8783c5e4-bc17-4d88-bec2-dbb83066c593}" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{8783c5e4-bc17-4d88-bec2-dbb83066c593}" description="Active routes">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0">
+              <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="0,0,0,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="markerSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <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">
                       <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"/>
@@ -19764,34 +20010,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 name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -19806,131 +20052,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="3" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="PointGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="3" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{10fa4124-46cc-47c8-abf9-a57ba9d4b9ad}" active="0" description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule key="{2b8e68ce-be16-4623-bce0-9e65634bdfd7}" active="0" description="21KM" filter="&quot;Source&quot; = '21KM'">
+          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{10fa4124-46cc-47c8-abf9-a57ba9d4b9ad}" description="List for legends">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" key="{2b8e68ce-be16-4623-bce0-9e65634bdfd7}" description="21KM">
               <settings calloutType="simple">
-                <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0">
+                <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                  <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="210,32,39,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="210,32,39,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                  <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeFillColor="210,32,39,255" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                    <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" 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="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"/>
@@ -19945,130 +20191,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                  <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                   <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="3" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-                <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="3" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+                <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{a4031224-6863-4443-9d92-421bcd31ec7b}" active="0" description="10KM" filter="&quot;Source&quot; = '10KM'">
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" key="{a4031224-6863-4443-9d92-421bcd31ec7b}" description="10KM">
               <settings calloutType="simple">
-                <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0">
+                <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                  <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="103,34,144,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="103,34,144,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                  <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeFillColor="103,34,144,255" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                    <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" 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="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"/>
@@ -20083,130 +20329,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                  <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                   <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-                <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+                <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{d8cdafa5-1dcf-47dc-bda3-d64d1d4fd1b6}" active="0" description="5KM" filter="&quot;Source&quot; = '5KM'">
+            <rule active="0" filter="&quot;Source&quot; = '5KM'" key="{d8cdafa5-1dcf-47dc-bda3-d64d1d4fd1b6}" description="5KM">
               <settings calloutType="simple">
-                <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0">
+                <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                  <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="145,211,55,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                  <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeFillColor="145,211,55,255" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                    <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" 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="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"/>
@@ -20221,138 +20467,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                  <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                   <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-                <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+                <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{d922a9ed-f9f3-49b7-ade9-94d817ff0cd5}" active="0" description="Trail" filter="&quot;Source&quot; = 'Trail'">
+            <rule active="0" filter="&quot;Source&quot; = 'Trail'" key="{d922a9ed-f9f3-49b7-ade9-94d817ff0cd5}" description="Trail">
               <settings calloutType="simple">
-                <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0">
+                <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                  <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="145,211,55,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                    <symbol name="markerSymbol" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                  <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeFillColor="145,211,55,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                    <symbol name="markerSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <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">
                         <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"/>
@@ -20375,34 +20621,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 name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                    <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" 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="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"/>
@@ -20417,77 +20663,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                  <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                   <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="PointGeometry"/>
-                <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                <placement layerType="PointGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+                <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -20497,13 +20743,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>
@@ -20512,47 +20758,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -20583,9 +20829,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>
@@ -20593,12 +20839,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -20613,8 +20859,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20623,8 +20869,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20633,8 +20879,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20643,8 +20889,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20653,8 +20899,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20663,8 +20909,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20673,8 +20919,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20683,18 +20929,25 @@ def my_form_open(dialog, layer, feature):
           <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 name="Sort" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option 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>
@@ -20703,8 +20956,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20713,8 +20966,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20723,8 +20976,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20746,77 +20999,81 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="Distance" index="5"/>
         <alias name="" field="RouteLen" index="6"/>
         <alias name="" field="Source" index="7"/>
-        <alias name="" field="length_m" index="8"/>
-        <alias name="" field="length_km" index="9"/>
-        <alias name="" field="org_fid" index="10"/>
-        <alias name="" field="distance" index="11"/>
-        <alias name="" field="quadrant" index="12"/>
+        <alias name="" field="Sort" index="8"/>
+        <alias name="" field="length_m" index="9"/>
+        <alias name="" field="length_km" index="10"/>
+        <alias name="" field="org_fid" index="11"/>
+        <alias name="" field="distance" index="12"/>
+        <alias name="" field="quadrant" index="13"/>
       </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="length_m" expression="" applyOnUpdate="0"/>
-        <default field="length_km" expression="" applyOnUpdate="0"/>
-        <default field="org_fid" expression="" applyOnUpdate="0"/>
-        <default field="distance" expression="" applyOnUpdate="0"/>
-        <default field="quadrant" expression="" applyOnUpdate="0"/>
+        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default expression="" field="descriptio" applyOnUpdate="0"/>
+        <default expression="" field="timestamp" applyOnUpdate="0"/>
+        <default expression="" field="begin" applyOnUpdate="0"/>
+        <default expression="" field="end" applyOnUpdate="0"/>
+        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default expression="" field="RouteLen" applyOnUpdate="0"/>
+        <default expression="" field="Source" applyOnUpdate="0"/>
+        <default expression="" field="Sort" applyOnUpdate="0"/>
+        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
+        <default expression="" field="org_fid" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default expression="" field="quadrant" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="org_fid" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="quadrant" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="quadrant" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="quadrant" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="Sort" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="quadrant" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
         <columns>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="org_fid" type="field" hidden="0"/>
-          <column width="-1" name="distance" type="field" hidden="0"/>
-          <column width="-1" name="Name" type="field" hidden="0"/>
-          <column width="-1" name="Source" type="field" hidden="0"/>
-          <column width="-1" name="RouteLen" type="field" hidden="0"/>
-          <column width="-1" name="descriptio" type="field" hidden="0"/>
-          <column width="-1" name="timestamp" type="field" hidden="0"/>
-          <column width="-1" name="begin" type="field" hidden="0"/>
-          <column width="-1" name="end" type="field" hidden="0"/>
-          <column width="-1" name="Distance" type="field" hidden="0"/>
-          <column width="-1" name="length_km" type="field" hidden="0"/>
-          <column width="-1" name="quadrant" type="field" hidden="0"/>
-          <column width="-1" name="length_m" type="field" hidden="0"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="Sort" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20848,19 +21105,19 @@ 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="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="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -20897,7 +21154,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiPolygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -20970,58 +21227,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -21052,36 +21309,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -21096,44 +21353,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -21156,38 +21413,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -21202,9 +21459,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>
@@ -21215,10 +21472,10 @@ 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>
@@ -21261,30 +21518,30 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="rotation" index="2"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="area" expression="" applyOnUpdate="0"/>
-        <default field="rotation" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="area" applyOnUpdate="0"/>
+        <default expression="" field="rotation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="area" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="rotation" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="area" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="rotation" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="area" desc="" exp=""/>
+        <constraint field="rotation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="area" type="field" hidden="0"/>
-          <column width="-1" name="rotation" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="area" hidden="0" type="field"/>
+          <column width="-1" name="rotation" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21307,7 +21564,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -21372,7 +21629,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21397,58 +21654,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -21479,36 +21736,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -21523,44 +21780,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -21583,49 +21840,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances" checkstate="0"/>
+          <rule checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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">
               <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"/>
@@ -21648,20 +21905,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>
@@ -21673,15 +21930,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>
@@ -21690,47 +21947,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -21761,9 +22018,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>
@@ -21771,12 +22028,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -21812,8 +22069,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -21829,8 +22086,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -21839,8 +22096,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -21904,70 +22161,70 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="last_runne" index="12"/>
       </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 expression="" field="Name" applyOnUpdate="0"/>
+        <default expression="" field="descriptio" applyOnUpdate="0"/>
+        <default expression="" field="timestamp" applyOnUpdate="0"/>
+        <default expression="" field="begin" applyOnUpdate="0"/>
+        <default expression="" field="end" applyOnUpdate="0"/>
+        <default expression="" field="RouteLen" applyOnUpdate="0"/>
+        <default expression="" field="Source" applyOnUpdate="0"/>
+        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
+        <default expression="" field="org_fid" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default expression="" field="first_runn" applyOnUpdate="0"/>
+        <default expression="" field="last_runne" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="org_fid" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="first_runn" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="last_runne" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="first_runn" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="last_runne" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="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 field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="first_runn" desc="" exp=""/>
+        <constraint field="last_runne" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column width="179" name="begin" type="field" hidden="0"/>
-          <column width="-1" name="RouteLen" type="field" hidden="0"/>
-          <column width="-1" name="Source" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="Name" type="field" hidden="0"/>
-          <column width="-1" name="length_m" type="field" hidden="0"/>
-          <column width="-1" name="length_km" type="field" hidden="0"/>
-          <column width="-1" name="org_fid" type="field" hidden="0"/>
-          <column width="-1" name="first_runn" type="field" hidden="0"/>
-          <column width="-1" name="last_runne" type="field" hidden="0"/>
-          <column width="-1" name="descriptio" type="field" hidden="0"/>
-          <column width="-1" name="timestamp" type="field" hidden="0"/>
-          <column width="-1" name="end" type="field" hidden="0"/>
-          <column width="-1" name="distance" type="field" hidden="0"/>
+          <column width="179" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="first_runn" hidden="0" type="field"/>
+          <column width="-1" name="last_runne" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21999,31 +22256,31 @@ 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 name="Distance" labelOnTop="0"/>
@@ -22058,7 +22315,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -22131,58 +22388,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -22213,36 +22470,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -22257,44 +22514,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -22317,58 +22574,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" filter="&quot;type&quot; IS 'car'" label="Car"/>
-          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -22399,50 +22656,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -22473,30 +22730,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">
               <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"/>
@@ -22516,33 +22773,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 name="@1@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -22558,32 +22815,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 name="@@1@1@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -22598,9 +22855,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>
@@ -22613,11 +22870,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>
@@ -22626,47 +22883,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -22697,9 +22954,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>
@@ -22707,12 +22964,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -22743,26 +23000,26 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="type" index="1"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22794,8 +23051,8 @@ 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 name="id" labelOnTop="0"/>
@@ -22807,7 +23064,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -22880,58 +23137,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -22962,36 +23219,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -23006,44 +23263,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -23066,44 +23323,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 symbollevels="0" referencescale="-1" type="nullSymbol" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="15" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="label" fontItalic="0">
+          <text-style fontSize="15" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -23118,66 +23375,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="5" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="0" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="4" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="5" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -23186,47 +23443,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -23257,9 +23514,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>
@@ -23267,12 +23524,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -23303,26 +23560,26 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="label" index="1"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="label" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="label" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="label" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23354,8 +23611,8 @@ 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 name="id" labelOnTop="0"/>
@@ -23367,7 +23624,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiPolygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -23432,7 +23689,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23457,58 +23714,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -23539,36 +23796,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -23583,44 +23840,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -23643,46 +23900,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 symbollevels="0" referencescale="-1" type="nullSymbol" forceraster="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" textOpacity="0.90000000000000002" fontWordSpacing="0" namedStyle="Bold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="75" fontStrikeout="0" textColor="31,120,180,255" useSubstitutions="0" fontUnderline="0" fieldName="label" fontItalic="0">
+              <text-style fontSize="8" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="31,120,180,255" legendString="Aa" textOrientation="horizontal" namedStyle="Bold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="75" textOpacity="0.90000000000000002" forcedItalic="0" forcedBold="0" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="0.75" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="-0.14999999999999999" shapeBorderWidthUnit="MM" shapeBorderColor="31,120,206,255" shapeSizeX="0.75" shapeSizeType="0" shapeFillColor="255,255,255,204" shapeSVGFile="" shapeBorderWidth="0.75" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeRadiiY="0.5" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeSizeY="0.29999999999999999" shapeRadiiX="0.5">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferSize="0.75" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeType="0" shapeSizeX="0.75" shapeBorderWidthUnit="MM" shapeBorderWidth="0.75" shapeRadiiY="0.5" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeFillColor="255,255,255,204" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0.29999999999999999" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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,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"/>
@@ -23697,56 +23954,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="5" lineAnchorType="0" quadOffset="1" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="1" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="0" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="5" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="0.76000000000000001" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="6" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="1" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="1" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="1" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="5" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="6" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="5" mergeLines="0" drawLabels="1" obstacleFactor="0.76000000000000001" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -23755,11 +24012,11 @@ 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="COALESCE( &quot;id&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;id&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -23768,47 +24025,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -23839,9 +24096,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>
@@ -23849,12 +24106,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -23869,8 +24126,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -23879,8 +24136,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -23889,8 +24146,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -23910,34 +24167,34 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="races" index="3"/>
       </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 expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="table_set" applyOnUpdate="0"/>
+        <default expression="" field="label" applyOnUpdate="0"/>
+        <default expression="" field="races" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="table_set" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="races" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="table_set" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="races" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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="id" desc="" exp=""/>
+        <constraint field="table_set" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
+        <constraint field="races" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="table_set" type="field" hidden="0"/>
-          <column width="-1" name="label" type="field" hidden="0"/>
-          <column width="130" name="races" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="table_set" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="130" name="races" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23969,10 +24226,10 @@ 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 editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="id" labelOnTop="0"/>
@@ -24012,7 +24269,8 @@ def my_form_open(dialog, layer, feature):
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
     <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
-    <layer id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
+    <layer id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
+    <layer id="marshals_by_position20161003112326575"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -24181,7 +24439,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Routes</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal overview/Gun Run 2022 - Marshal Plan Day 2 rev 1.0.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -24343,287 +24601,317 @@ 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 style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Access Routes">
+      <layer expanded="1" visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0"/>
+      <layer expanded="0" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="Elevation"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="All Routes" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="All Routes">
+      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer expanded="1" visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="Marshals"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Ask Me"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Fencing">
+      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" 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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Marshal map - inset">
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" 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 style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Marshal map - main">
+      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+        <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal overview" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-        <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+    <visibility-preset has-expanded-info="1" name="Marshal overview" has-checked-group-info="1">
+      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Proposed Routes" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Routes" has-expanded-info="1" has-checked-group-info="1">
-      <layer style="default" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" expanded="1"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
-      <layer style="default" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" expanded="1"/>
-      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <layer expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" 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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="water_tables20170921142016467" visible="0" expanded="1"/>
+      <layer expanded="1" visible="0" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" style="default"/>
+      <expanded-legend-nodes id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" visible="0" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <layer expanded="1" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" style="default"/>
+      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <layer expanded="1" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" style="default"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Proposed Routes">
+      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" 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" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Routes" has-checked-group-info="1">
+      <layer expanded="1" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" style="default"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer expanded="1" visible="0" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="0" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" 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="{ead1c5b2-1bdf-46f1-9a2d-4cfa2c6acb18}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" visible="1" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" style="default"/>
+      <expanded-legend-nodes id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
+      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" style="default"/>
+      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <layer expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" 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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
+      </checked-legend-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="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Routes"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
+      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <expanded-group-nodes>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -24650,31 +24938,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" name="Routes" units="mm" printResolution="144">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Routes" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -24689,49 +24977,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -24746,59 +25034,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" position="0" page="0" units="mm"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="14.1764,7.471,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="[%&quot;Distance&quot;%]" frame="false" visibility="1" halign="1" zValue="9" positionOnPage="9.44946,191.611,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="9.44946,191.611,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="14.1764,7.471,mm" referencePoint="0" labelText="[%&quot;Distance&quot;%]" htmlState="0" zValue="9" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="9.44946,191.611,mm" frame="false" marginY="1" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="14" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -24813,65 +25101,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="29.2025,7.272,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="RACE ROUTE" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="24.2445,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="24.2445,191.81,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="29.2025,7.272,mm" referencePoint="0" labelText="RACE ROUTE" htmlState="0" zValue="8" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="24.2445,191.81,mm" frame="false" marginY="1" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="14" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -24886,65 +25174,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="57.4836,6.8714,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.0" frame="false" visibility="1" halign="2" zValue="6" positionOnPage="204.225,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="204.225,191.81,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="6" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="204.225,191.81,mm" frame="false" marginY="1" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -24959,65 +25247,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="51.6706,6.60801,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 September 2020" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="210.038,199.082,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="210.038,199.082,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" referencePoint="0" labelText="Sunday, 20 September 2020" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="210.038,199.082,mm" frame="false" marginY="1" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -25032,39 +25320,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" frameJoinStyle="miter" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" groupUuid="" pictureWidth="29.7523" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="4" positionLock="true" frame="false" pictureHeight="17.4074" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="4" positionOnPage="262.196,188.218,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="262.196,188.218,mm" northMode="0" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" referencePoint="0" zValue="4" anchorPoint="4" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="262.196,188.218,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="17.4074" groupUuid="" pictureWidth="29.7523" northMode="0" position="262.196,188.218,mm" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -25072,42 +25360,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="251.959,0.1,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="3" positionOnPage="9.59946,198.832,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="9.59946,198.832,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="251.959,0.1,mm" referencePoint="0" zValue="3" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="9.59946,198.832,mm" frame="false" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -25122,61 +25410,61 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="67.7828,166.874,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="2" positionOnPage="5.86559,4.09761,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="5.86559,4.09761,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" excludeFromExports="0" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="67.7828,166.874,mm" referencePoint="0" isTemporal="0" zValue="2" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.86559,4.09761,mm" frame="true" mapRotation="0" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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="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>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" xmin="18.37288570000000121" ymax="-33.91513741583252539"/>
+        <Extent ymin="-33.94652930000000168" xmax="18.38563681624126289" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -25191,45 +25479,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -25260,44 +25548,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -25320,40 +25608,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -25368,29 +25656,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -25400,43 +25688,43 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" frameJoinStyle="round" size="282.012,174.44,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="9.44946,9.08557,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="9.44946,9.08557,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" excludeFromExports="0" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="282.012,174.44,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="9.44946,9.08557,mm" frame="true" mapRotation="0" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" excludeFromExports="0" frameJoinStyle="round" groupUuid="" position="9.44946,9.08557,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" positionLock="true" id="" opacity="1" outlineWidthM="0.15,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END" 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 '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END" type="QString"/>
+                  <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.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END" 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.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END" type="QString"/>
+                  <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.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END" 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.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END" type="QString"/>
+                  <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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.4199345745815819" ymin="-33.91199999999999903" xmin="18.39750000000000085" ymax="-33.89812294355778732"/>
+        <Extent ymin="-33.92999999999999972" xmax="18.42303517425787263" ymax="-33.89719473757251222" xmin="18.37000000000000099"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -25451,45 +25739,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -25520,44 +25808,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -25580,40 +25868,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -25628,29 +25916,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -25660,60 +25948,60 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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="1" name="pdfAppendGeoreference" type="QString"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="QString"/>
-          <Option value="1" name="pdfSimplify" 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="pdfAppendGeoreference" value="1" type="QString"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="QString"/>
+          <Option name="pdfSimplify" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" pageNameExpression="&quot;Distance&quot;" sortKey="&quot;Sort&quot;" hideCoverage="0" coverageLayerName="all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" coverageLayerProvider="ogr" enabled="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortAscending="1" filterFeatures="1"/>
+      <Atlas sortFeatures="1" sortKey="&quot;Sort&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerName="all_routes" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="0" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" filterFeatures="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshals" units="mm" printResolution="120">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshals" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -25728,49 +26016,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -25785,9 +26073,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>
@@ -25795,15 +26083,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem excludeFromExports="0" symbolHeight="4" type="65642" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" boxSpace="2" positionLock="true" equalColumnWidth="1" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="7" columnSpace="2" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="110.353,5.04491,mm" frame="true" zValue="5" opacity="1" splitLayer="0" outlineWidthM="0.1,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="110.353,5.04491,mm" id="" groupUuid="" rasterBorderWidth="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="bevel" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" size="39.4312,46.1,mm" lineSpacing="1">
-        <FrameColor red="128" green="128" alpha="255" blue="128"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.1,mm" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="true" wmsLegendWidth="50" positionOnPage="110.353,5.04491,mm" itemRotation="0" zValue="5" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="110.353,5.04491,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="39.4312,46.1,mm" positionLock="true" frameJoinStyle="bevel" background="true" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorderWidth="0">
+        <FrameColor blue="128" green="128" red="128" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -25811,48 +26099,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="Regular" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="1" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" alignment="1" marginLeft="2" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <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 name="Fencing and Cones" checked="Qt::Unchecked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Unchecked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing">
               <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>
@@ -25860,62 +26148,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.2,mm" frameJoinStyle="miter" size="56.5192,54.5647,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="4" positionOnPage="98.7828,149.027,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="98.7828,149.027,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" excludeFromExports="0" followPresetName="Marshal map - inset">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="56.5192,54.5647,mm" referencePoint="0" isTemporal="0" zValue="4" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="98.7828,149.027,mm" frame="true" mapRotation="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="98.7828,149.027,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionLock="true" id="" opacity="1" outlineWidthM="0.2,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal map - inset" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
-        <Extent xmax="18.41493455420295433" ymin="-33.90316824413850583" xmin="18.41064302246786966" ymax="-33.89902512102636223"/>
+        <Extent ymin="-33.90316824413850583" xmax="18.41493455420295433" ymax="-33.89902512102636223" xmin="18.41064302246786966"/>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -25946,44 +26234,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -26006,40 +26294,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -26054,29 +26342,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -26084,28 +26372,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview name="Overview 1" position="3" blendMode="0" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" inverted="0">
-          <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <ComposerMapOverview position="3" centered="1" show="1" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" inverted="0" blendMode="0" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -26120,9 +26408,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>
@@ -26130,9 +26418,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>
@@ -26142,67 +26430,67 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="142,187.018,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="3" positionOnPage="3.53,6.0007,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="false" followPreset="true" position="3.53,6.0007,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" excludeFromExports="0" followPresetName="Marshal map - main">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="142,187.018,mm" referencePoint="0" isTemporal="0" zValue="3" itemRotation="0" background="false" followPreset="true" type="65639" blendMode="0" positionOnPage="3.53,6.0007,mm" frame="false" mapRotation="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal map - main" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
-        <Extent xmax="18.41330222336237554" ymin="-33.9017728906146445" xmin="18.41227535330844844" ymax="-33.90042047455022356"/>
+        <Extent ymin="-33.9017728906146445" xmax="18.41330222336237554" ymax="-33.90042047455022356" xmin="18.41227535330844844"/>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -26233,44 +26521,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -26293,40 +26581,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -26341,29 +26629,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -26373,20 +26661,20 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" frameJoinStyle="round" size="142.117,187.018,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" groupUuid="" itemRotation="0" sectionY="0" id="" sectionHeight="182.4" hidePageIfEmpty="0" blendMode="0" positionLock="true" frame="false" sectionX="0" visibility="1" sectionWidth="142.117" zValue="2" positionOnPage="290.617,6.0007,mm" referencePoint="2" opacity="1" type="65647" background="false" position="290.617,6.0007,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hideBackgroundIfEmpty="0" excludeFromExports="0" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
-        <FrameColor red="119" green="119" alpha="255" blue="119"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="142.117,187.018,mm" referencePoint="2" hidePageIfEmpty="0" zValue="2" itemRotation="0" hideBackgroundIfEmpty="0" background="false" sectionX="0" type="65647" blendMode="0" positionOnPage="290.617,6.0007,mm" frame="false" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" visibility="1" excludeFromExports="0" frameJoinStyle="round" sectionY="0" groupUuid="" position="290.617,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionWidth="142.117" sectionHeight="182.4" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
+        <FrameColor blue="119" green="119" red="119" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -26394,21 +26682,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" mapUuid="" frameJoinStyle="miter" size="47.1065,27.6,mm" svgBorderColor="0,0,0,255" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" groupUuid="" pictureWidth="47.1065" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="0" positionLock="true" frame="false" pictureHeight="27.561" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="1" positionOnPage="246.665,178.41,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="246.665,178.41,mm" northMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="47.1065,27.6,mm" referencePoint="0" zValue="1" anchorPoint="0" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="246.665,178.41,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="27.561" groupUuid="" pictureWidth="47.1065" northMode="0" position="246.665,178.41,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -26416,14 +26704,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame stylesheetEnabled="true" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" resizeMode="0" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" maxBreakDistance="12" evaluateExpressions="true" type="65648" useSmartBreaks="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" url="" 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;}" contentMode="1">
-        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame resizeMode="0" evaluateExpressions="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" url="" type="65648" maxBreakDistance="12" stylesheetEnabled="true" contentMode="1" useSmartBreaks="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
+        <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>
@@ -26433,53 +26721,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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" pageNameExpression="&quot;position&quot;" sortKey="position" hideCoverage="0" coverageLayerName="marshal_positions" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1" coverageLayerProvider="ogr" enabled="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortAscending="1" filterFeatures="0"/>
+      <Atlas sortFeatures="1" sortKey="position" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerName="marshal_positions" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" filterFeatures="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan" units="mm" printResolution="120">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -26494,49 +26782,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,420,mm" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,420,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -26551,9 +26839,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>
@@ -26561,15 +26849,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem excludeFromExports="0" symbolHeight="4" type="65642" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" boxSpace="2" positionLock="true" equalColumnWidth="1" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="7" columnSpace="2" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="15.6525,12.5708,mm" frame="false" zValue="8" opacity="1" splitLayer="0" outlineWidthM="0.3,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="15.6525,12.5708,mm" id="" groupUuid="" rasterBorderWidth="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="miter" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" size="21.6797,27,mm" lineSpacing="1">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="false" wmsLegendWidth="50" positionOnPage="15.6525,12.5708,mm" itemRotation="0" zValue="8" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="15.6525,12.5708,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="21.6797,33,mm" positionLock="true" frameJoinStyle="miter" background="true" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -26577,35 +26865,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="1" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" alignment="1" marginLeft="2" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <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="expandedLegendNodes" type="invalid"/>
+                  <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>
@@ -26613,47 +26903,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="45.1194,7.36972,mm" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="MARSHAL POSITIONS" frame="false" visibility="1" halign="1" zValue="7" positionOnPage="5.69321,399.106,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="5.69321,399.106,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="45.1194,7.36972,mm" referencePoint="0" labelText="MARSHAL POSITIONS" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,399.106,mm" frame="false" marginY="1" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,399.106,mm" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -26668,65 +26958,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="16.2476,7.80192,mm" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Page [% &quot;page&quot; %]" frame="false" visibility="1" halign="1" zValue="6" positionOnPage="5.69321,406.988,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="5.69321,406.988,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="16.2476,7.80192,mm" referencePoint="0" labelText="Page [% &quot;page&quot; %]" htmlState="0" zValue="6" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,406.988,mm" frame="false" marginY="1" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,406.988,mm" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -26741,65 +27031,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="27.7839,7.51682,mm" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.2" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="214.292,406.988,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="214.292,406.988,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="27.7839,7.51682,mm" referencePoint="0" labelText="REVISION 1.2" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="214.292,406.988,mm" frame="false" marginY="1" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="214.292,406.988,mm" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -26814,65 +27104,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="56.3557,7.36902,mm" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 October 2019" frame="false" visibility="1" halign="2" zValue="4" positionOnPage="185.72,399.107,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="185.72,399.107,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="56.3557,7.36902,mm" referencePoint="0" labelText="Sunday, 20 October 2019" htmlState="0" zValue="4" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="185.72,399.107,mm" frame="false" marginY="1" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="185.72,399.107,mm" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -26887,39 +27177,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="" frameJoinStyle="miter" size="49.3143,31.2967,mm" svgBorderColor="0,0,0,255" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" groupUuid="" pictureWidth="49.3143" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="8" positionLock="true" frame="false" pictureHeight="28.8527" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="3" positionOnPage="243.319,382.696,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="243.319,382.696,mm" northMode="0" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="49.3143,31.2967,mm" referencePoint="0" zValue="3" anchorPoint="8" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="243.319,382.696,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="28.8527" groupUuid="" pictureWidth="49.3143" northMode="0" position="243.319,382.696,mm" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -26927,42 +27217,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="236.083,0.14328,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="2" positionOnPage="5.84321,406.626,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="5.84321,406.626,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="236.083,0.14328,mm" referencePoint="0" zValue="2" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="5.84321,406.626,mm" frame="false" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.84321,406.626,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -26977,90 +27267,90 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="286.94,392.396,mm" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="5.03,5.9483,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="5.03,5.9483,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" excludeFromExports="0" followPresetName="Marshal overview">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="286.94,392.396,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.03,5.9483,mm" frame="false" mapRotation="0" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.03,5.9483,mm" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal overview" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 xmax="18.38613924055453452" ymin="-33.94797288016832226" xmin="18.36924763341120581" ymax="-33.9248732774534929"/>
+        <Extent ymin="-33.91857233280978789" xmax="18.42124635930919041" ymax="-33.89547273009495854" xmin="18.4043547521658617"/>
         <LayerSet/>
         <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" pageNameExpression="&quot;page&quot;" sortKey="page" hideCoverage="1" coverageLayerName="marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayerProvider="ogr" enabled="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortAscending="1" filterFeatures="0"/>
+      <Atlas sortFeatures="1" sortKey="page" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm" printResolution="300">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -27075,49 +27365,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -27132,9 +27422,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>
@@ -27142,21 +27432,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frameJoinStyle="miter" size="9.45865,11,mm" svgBorderColor="0,0,0,255" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" groupUuid="" pictureWidth="6.31767" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="0" positionLock="true" frame="false" pictureHeight="7.97477" svgFillColor="255,255,255,255" pictureRotation="330" visibility="1" file="arrows/NorthArrow_11.svg" northOffset="0" mode="0" zValue="4" positionOnPage="286.027,2,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="286.027,2,mm" northMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="9.45865,11,mm" referencePoint="0" zValue="4" anchorPoint="0" pictureRotation="330" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="286.027,2,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="7.97477" groupUuid="" pictureWidth="6.31767" northMode="0" position="286.027,2,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" resizeMode="0" positionLock="true" id="" opacity="1" file="arrows/NorthArrow_11.svg" outlineWidthM="0.3,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -27164,47 +27454,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="142.543,10.3185,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" groupUuid="" valign="64" itemRotation="270" id="" blendMode="0" positionLock="true" labelText="[%upper( &quot;area&quot; )%]" frame="false" visibility="1" halign="1" zValue="3" positionOnPage="285.027,205.886,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="285.027,205.886,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="142.543,10.3185,mm" referencePoint="0" labelText="[%upper( &quot;area&quot; )%]" htmlState="0" zValue="3" itemRotation="270" background="false" halign="1" type="65641" blendMode="0" positionOnPage="285.027,205.886,mm" frame="false" marginY="1" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -27219,65 +27509,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 excludeFromExports="0" segmentMillimeters="26.3519" type="65646" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" lineCapStyle="square" subdivisionsHeight="1.5" positionLock="true" lineJoinStyle="miter" background="false" unitLabel="m" outlineWidth="0.3" labelVerticalPlacement="0" style="Single Box" blendMode="0" boxContentSpace="1" unitType="meters" visibility="1" labelHorizontalPlacement="0" numSubdivisions="1" maxBarWidth="150" labelBarSpace="3" positionOnPage="7,189.669,mm" numSegmentsLeft="2" frame="false" numUnitsPerSegment="100" minBarWidth="50" zValue="2" opacity="1" outlineWidthM="0.3,mm" itemRotation="0" alignment="0" position="7,189.669,mm" id="" groupUuid="" numSegments="4" numMapUnitsPerScaleBarUnit="1" referencePoint="0" frameJoinStyle="miter" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" segmentSizeMode="1" size="145.54,16.2165,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" height="3">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" segmentSizeMode="1" numMapUnitsPerScaleBarUnit="1" labelVerticalPlacement="0" id="" outlineWidthM="0.3,mm" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" lineJoinStyle="miter" referencePoint="0" frame="false" numSegments="4" labelHorizontalPlacement="0" maxBarWidth="150" height="3" positionOnPage="7,189.669,mm" itemRotation="0" zValue="2" excludeFromExports="0" blendMode="0" groupUuid="" segmentMillimeters="26.3519" labelBarSpace="3" position="7,189.669,mm" style="Single Box" opacity="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" minBarWidth="50" lineCapStyle="square" subdivisionsHeight="1.5" unitType="meters" type="65646" boxContentSpace="1" numSubdivisions="1" size="145.54,16.2165,mm" positionLock="true" frameJoinStyle="miter" background="false" unitLabel="m" outlineWidth="0.3" visibility="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" alignment="0" numUnitsPerSegment="100">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -27292,75 +27582,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 red="0" green="0" alpha="255" blue="0"/>
+        <strokeColor blue="0" green="0" red="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 red="0" green="0" alpha="255" blue="0"/>
-        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
         <lineSymbol>
-          <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -27391,52 +27681,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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -27467,52 +27757,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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -27543,36 +27833,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -27587,36 +27877,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -27631,87 +27921,87 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="278.027,180.318,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" itemRotation="0" mapRotation="330" id="" blendMode="0" isTemporal="0" positionLock="true" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="7,5.5,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="false" followPreset="true" position="7,5.5,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" followPresetName="Start/Finish">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="278.027,180.318,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="false" followPreset="true" type="65639" blendMode="0" positionOnPage="7,5.5,mm" frame="false" mapRotation="330" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Start/Finish" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41790915398017958" ymin="-33.90494830469008747" xmin="18.40843143571575169" ymax="-33.89880140828828559"/>
+        <Extent ymin="-33.90494830469008747" xmax="18.41790915398017958" ymax="-33.89880140828828559" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="3" gridStyle="0" rightAnnotationDisplay="3" minimumIntervalWidth="50" intervalY="5" gridFramePenThickness="0.5" intervalX="5" unit="1" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="4" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="3">
+        <ComposerMapGrid offsetY="0" intervalY="5" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="4" crossLength="3" rotatedTicksLengthMode="0" unit="1" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" rotatedTicksMarginToCorner="0" intervalX="5" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="3" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="3" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -27742,44 +28032,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -27802,9 +28092,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>
@@ -27821,32 +28111,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -27861,29 +28151,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -27893,63 +28183,63 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.05" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" pageNameExpression="&quot;area&quot;" sortKey="area" hideCoverage="1" coverageLayerName="start_finish_area" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayerProvider="ogr" enabled="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortAscending="1" filterFeatures="0"/>
+      <Atlas sortFeatures="1" sortKey="area" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerName="start_finish_area" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing" units="mm" printResolution="300">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Fencing" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -27964,49 +28254,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -28021,9 +28311,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>
@@ -28031,47 +28321,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="148.46,7.36972,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="FENCING: [% &quot;name&quot; %]" frame="false" visibility="1" halign="1" zValue="11" positionOnPage="6.76779,190.27,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="6.76779,190.27,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="148.46,7.36972,mm" referencePoint="0" labelText="FENCING: [% &quot;name&quot; %]" htmlState="0" zValue="11" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="6.76779,190.27,mm" frame="false" marginY="1" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28086,65 +28376,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="27.7839,7.51682,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.0" frame="false" visibility="1" halign="2" zValue="10" positionOnPage="211.295,197.64,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="211.295,197.64,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="27.7839,7.51682,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="10" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="211.295,197.64,mm" frame="false" marginY="1" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28159,65 +28449,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="67.0856,7.80192,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" frame="false" visibility="1" halign="1" zValue="9" positionOnPage="115.637,198.083,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="115.637,198.083,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="67.0856,7.80192,mm" referencePoint="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" htmlState="0" zValue="9" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="115.637,198.083,mm" frame="false" marginY="1" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="115.637,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28232,65 +28522,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="53.0017,7.80192,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="59.5581,198.083,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="59.5581,198.083,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="53.0017,7.80192,mm" referencePoint="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" htmlState="0" zValue="8" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="59.5581,198.083,mm" frame="false" marginY="1" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="59.5581,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28305,65 +28595,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="52.7903,7.80192,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Page [% @atlas_featurenumber %]" frame="false" visibility="1" halign="1" zValue="7" positionOnPage="6.76779,198.083,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="6.76779,198.083,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="52.7903,7.80192,mm" referencePoint="0" labelText="Page [% @atlas_featurenumber %]" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="6.76779,198.083,mm" frame="false" marginY="1" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28378,39 +28668,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="" frameJoinStyle="miter" size="49.3143,29.8354,mm" svgBorderColor="0,0,0,255" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" groupUuid="" pictureWidth="49.3143" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="8" positionLock="true" frame="false" pictureHeight="28.8527" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="6" positionOnPage="243.098,175.353,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="243.098,175.353,mm" northMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="49.3143,29.8354,mm" referencePoint="0" zValue="6" anchorPoint="8" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="243.098,175.353,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="28.8527" groupUuid="" pictureWidth="49.3143" northMode="0" position="243.098,175.353,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -28418,47 +28708,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="56.3557,7.36902,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 September 2020" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="182.723,190.271,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="182.723,190.271,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="56.3557,7.36902,mm" referencePoint="0" labelText="Sunday, 20 September 2020" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="182.723,190.271,mm" frame="false" marginY="1" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28473,60 +28763,60 @@ 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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="232.01,0.14328,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="4" positionOnPage="6.91779,197.79,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="6.91779,197.79,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="232.01,0.14328,mm" referencePoint="0" zValue="4" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="6.91779,197.79,mm" frame="false" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -28541,55 +28831,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 excludeFromExports="0" segmentMillimeters="28.4264" type="65646" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" lineCapStyle="square" subdivisionsHeight="1.5" positionLock="true" lineJoinStyle="round" background="false" unitLabel="m" outlineWidth="0.2" labelVerticalPlacement="0" style="Double Box" blendMode="0" boxContentSpace="0.2" unitType="meters" visibility="1" labelHorizontalPlacement="0" numSubdivisions="1" maxBarWidth="100" labelBarSpace="1" positionOnPage="6.76779,2.8482,mm" numSegmentsLeft="2" frame="false" numUnitsPerSegment="10" minBarWidth="25" zValue="3" opacity="1" outlineWidthM="0.3,mm" itemRotation="0" alignment="0" position="6.76779,2.8482,mm" id="" groupUuid="" numSegments="2" numMapUnitsPerScaleBarUnit="1" referencePoint="0" frameJoinStyle="miter" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" segmentSizeMode="1" size="95.0404,15.8378,mm" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" height="2">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" segmentSizeMode="1" numMapUnitsPerScaleBarUnit="1" labelVerticalPlacement="0" id="" outlineWidthM="0.3,mm" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" lineJoinStyle="round" referencePoint="0" frame="false" numSegments="2" labelHorizontalPlacement="0" maxBarWidth="100" height="2" positionOnPage="6.76779,2.8482,mm" itemRotation="0" zValue="3" excludeFromExports="0" blendMode="0" groupUuid="" segmentMillimeters="28.4264" labelBarSpace="1" position="6.76779,2.8482,mm" style="Double Box" opacity="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" minBarWidth="25" lineCapStyle="square" subdivisionsHeight="1.5" unitType="meters" type="65646" boxContentSpace="0.2" numSubdivisions="1" size="95.0404,15.8378,mm" positionLock="true" frameJoinStyle="miter" background="false" unitLabel="m" outlineWidth="0.2" visibility="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" alignment="0" numUnitsPerSegment="10">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28604,75 +28894,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 red="0" green="0" alpha="255" blue="0"/>
+        <strokeColor blue="0" green="0" red="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 red="0" green="0" alpha="255" blue="0"/>
-        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
         <lineSymbol>
-          <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -28703,52 +28993,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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -28779,52 +29069,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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -28855,36 +29145,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -28899,36 +29189,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -28943,24 +29233,24 @@ 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 excludeFromExports="0" symbolHeight="4" type="65642" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" boxSpace="2" positionLock="true" equalColumnWidth="1" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="7" columnSpace="2" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="256.808,2.9982,mm" frame="true" zValue="2" opacity="1" splitLayer="0" outlineWidthM="0.3,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="256.808,2.9982,mm" id="" groupUuid="" rasterBorderWidth="0" maxSymbolSize="0" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="miter" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" size="38.1563,54.9504,mm" lineSpacing="1">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="true" wmsLegendWidth="50" positionOnPage="256.808,2.9982,mm" itemRotation="0" zValue="2" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="256.808,2.9982,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="38.1563,54.9504,mm" positionLock="true" frameJoinStyle="miter" background="true" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" rasterBorder="1" resizeToContents="0" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -28968,52 +29258,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="Bold" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" italic="0" bold="1" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" style="Bold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="3" name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="3" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2.5" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" alignment="1" marginLeft="2" indent="0">
-            <styleFont style="Regular" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0" underline="0"/>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing">
               <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" 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" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <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>
@@ -29021,44 +29311,44 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="283.418,180.92,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="6.76779,9.35102,mm" mapFlags="0" referencePoint="0" opacity="0.9" type="65639" background="false" followPreset="true" position="6.76779,9.35102,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" excludeFromExports="0" followPresetName="Fencing">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="283.418,180.92,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="false" followPreset="true" type="65639" blendMode="0" positionOnPage="6.76779,9.35102,mm" frame="false" mapRotation="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" id="" opacity="0.9" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Fencing" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.4172496509604926" ymin="-33.90421228789515595" xmin="18.41635400827248503" ymax="-33.90364055490629625"/>
+        <Extent ymin="-33.90421228789515595" xmax="18.4172496509604926" ymax="-33.90364055490629625" xmin="18.41635400827248503"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -29073,45 +29363,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="3" gridStyle="0" rightAnnotationDisplay="3" minimumIntervalWidth="50" intervalY="5" gridFramePenThickness="0.5" intervalX="5" unit="1" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="4" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="3">
+        <ComposerMapGrid offsetY="0" intervalY="5" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="4" crossLength="3" rotatedTicksLengthMode="0" unit="1" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" rotatedTicksMarginToCorner="0" intervalX="5" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="3" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="3" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -29142,44 +29432,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -29202,9 +29492,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>
@@ -29221,32 +29511,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -29261,29 +29551,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -29293,60 +29583,60 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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="1" name="pdfAppendGeoreference" type="QString"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="QString"/>
-          <Option value="1" name="pdfSimplify" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="rasterize" 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="pdfAppendGeoreference" value="1" type="QString"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="QString"/>
+          <Option name="pdfSimplify" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="rasterize" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" pageNameExpression="&quot;name&quot;" sortKey="group" hideCoverage="1" coverageLayerName="fence_groups" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayerProvider="virtual" enabled="1" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" sortAscending="1" filterFeatures="0"/>
+      <Atlas sortFeatures="1" sortKey="group" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" coverageLayerProvider="virtual" sortAscending="1" hideCoverage="1" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm" printResolution="144">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="9" offsetUnits="mm"/>
+    <Layout units="mm" name="Ask Me" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="9" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -29361,49 +29651,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -29418,59 +29708,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" position="0" page="0" units="mm"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="83.9998,10.4638,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="false" labelText="Directions to Start of Race" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="4.43449,186.634,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="4.43449,186.634,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="83.9998,10.4638,mm" referencePoint="0" labelText="Directions to Start of Race" htmlState="0" zValue="8" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="4.43449,186.634,mm" frame="false" marginY="1" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="14" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -29485,65 +29775,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="48.2923,9.511,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="false" labelText="Gun Run" frame="false" visibility="1" halign="1" zValue="7" positionOnPage="4.43449,197.498,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="4.43449,197.498,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="48.2923,9.511,mm" referencePoint="0" labelText="Gun Run" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="4.43449,197.498,mm" frame="false" marginY="1" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -29558,33 +29848,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 excludeFromExports="0" symbolHeight="5" type="65642" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" boxSpace="2" positionLock="false" equalColumnWidth="0" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="9" columnSpace="0" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="10.096,10.8563,mm" frame="true" zValue="6" opacity="1" splitLayer="0" outlineWidthM="0.3,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="10.096,10.8563,mm" id="" groupUuid="" rasterBorderWidth="0" legendFilterByMap="1" maxSymbolSize="0" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="round" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" size="59.0766,76,mm" lineSpacing="2">
-        <FrameColor red="139" green="139" alpha="255" blue="139"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="9" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolHeight="5" referencePoint="0" lineSpacing="2" frame="true" wmsLegendWidth="50" positionOnPage="10.096,10.8563,mm" itemRotation="0" zValue="6" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="0" position="10.096,10.8563,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="0" columnCount="1" size="59.0766,76,mm" positionLock="false" frameJoinStyle="round" background="true" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByMap="1" rasterBorderWidth="0">
+        <FrameColor blue="139" green="139" red="139" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -29592,52 +29882,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2.5" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2.5" alignment="1" marginLeft="3" indent="0">
-            <styleFont style="Regular" strikethrough="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0" underline="0"/>
+          <style marginTop="2.5" marginLeft="3" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Ask Me" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Ask Me" groupLayer="" checked="Qt::Checked">
             <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 legend_exp="" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./poi_labels.shp|layername=poi_labels">
               <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 legend_exp="" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start">
               <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>
@@ -29645,47 +29935,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="27.7839,6.871,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="false" labelText="REVISION 1.0" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="221.862,190.027,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="221.862,190.027,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="27.7839,6.871,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="221.862,190.027,mm" frame="false" marginY="1" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -29700,65 +29990,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="51.6706,6.60801,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="false" labelText="Sunday, 20 October 2019" frame="false" visibility="1" halign="2" zValue="4" positionOnPage="197.975,197.498,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="197.975,197.498,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" referencePoint="0" labelText="Sunday, 20 October 2019" htmlState="0" zValue="4" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="197.975,197.498,mm" frame="false" marginY="1" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -29773,39 +30063,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="miter" size="42.9838,24.3824,mm" svgBorderColor="0,0,0,255" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" groupUuid="" pictureWidth="41.6737" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="4" positionLock="false" frame="false" pictureHeight="24.3824" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="3" positionOnPage="249.646,179.724,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="249.646,179.724,mm" northMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="42.9838,24.3824,mm" referencePoint="0" zValue="3" anchorPoint="4" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="249.646,179.724,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="24.3824" groupUuid="" pictureWidth="41.6737" northMode="0" position="249.646,179.724,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" resizeMode="0" positionLock="false" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -29813,42 +30103,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="244.912,0.1,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="2" positionOnPage="4.58449,197.248,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="4.58449,197.248,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="244.912,0.1,mm" referencePoint="0" zValue="2" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="4.58449,197.248,mm" frame="false" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -29863,46 +30153,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>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="288.007,183.616,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="false" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="4.43449,6.411,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="4.43449,6.411,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" followPresetName="Ask Me">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="288.007,183.616,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="4.43449,6.411,mm" frame="false" mapRotation="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Ask Me" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41789384089274151" ymin="-33.90994364588821952" xmin="18.39762336729721071" ymax="-33.8970204297764468"/>
+        <Extent ymin="-33.90994364588821952" xmax="18.41789384089274151" ymax="-33.8970204297764468" xmin="18.39762336729721071"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -29917,45 +30207,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -29986,44 +30276,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -30046,40 +30336,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -30094,29 +30384,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -30126,54 +30416,54 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 pageNameExpression="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0" enabled="0" coverageLayer="" filterFeatures="0"/>
+      <Atlas sortFeatures="0" hideCoverage="0" coverageLayer="" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" enabled="0"/>
     </Layout>
-    <Layout worldFileMap="" name="All Routes" units="mm" printResolution="144">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="All Routes" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -30188,49 +30478,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -30245,59 +30535,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" position="0" page="0" units="mm"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="61.5373,6.60801,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Gun Run 2022: [%&quot;Source&quot;%]" frame="false" visibility="1" halign="1" zValue="10" positionOnPage="9.7863,192.073,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="9.7863,192.073,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="61.5373,6.8714,mm" referencePoint="0" labelText="REVISION 2.3" htmlState="0" zValue="13" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="200.171,199.082,mm" frame="false" marginY="1" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="200.171,199.082,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -30312,65 +30602,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="61.5373,6.8714,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 2.0" frame="false" visibility="1" halign="2" zValue="9" positionOnPage="200.171,199.082,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="200.171,199.082,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="61.5373,6.60801,mm" referencePoint="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" htmlState="0" zValue="12" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="9.7863,192.073,mm" frame="false" marginY="1" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.7863,192.073,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -30385,65 +30675,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="61.5373,6.60801,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="9.7863,199.082,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="9.7863,199.082,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="61.5373,6.60801,mm" referencePoint="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" htmlState="0" zValue="11" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="9.7863,199.082,mm" frame="false" marginY="1" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.7863,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -30458,39 +30748,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frameJoinStyle="miter" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" groupUuid="" pictureWidth="29.7523" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="4" positionLock="true" frame="false" pictureHeight="17.4074" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="7" positionOnPage="262.196,188.218,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="262.196,188.218,mm" northMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" referencePoint="0" zValue="10" anchorPoint="4" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="262.196,188.218,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="17.4074" groupUuid="" pictureWidth="29.7523" northMode="0" position="262.196,188.218,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -30498,42 +30788,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="251.982,0.1,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="6" positionOnPage="9.57644,198.832,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="9.57644,198.832,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="251.982,0.1,mm" referencePoint="0" zValue="9" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="9.57644,198.832,mm" frame="false" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.57644,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -30548,171 +30838,321 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="67.7828,166.874,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" groupUuid="" itemRotation="0" mapRotation="0" id="Left inset" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="5" positionOnPage="5.86559,4.09761,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="false" position="5.86559,4.09761,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" excludeFromExports="0" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="107.861,186.385,mm" referencePoint="0" isTemporal="0" zValue="8" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="9.57644,5.42566,mm" frame="true" mapRotation="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.57644,5.42566,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" positionLock="true" id="Trail Finish" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
-                <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>
-                <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>
-                <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>
-                <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>
                 <Option name="dataDefinedOpacity" 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;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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38626092146919788" ymin="-33.94700000000000273" xmin="18.37399999999999878" ymax="-33.91681492292400435"/>
+        <Extent ymin="-33.93243205975926458" xmax="18.41187375074135701" ymax="-33.90007566747966905" xmin="18.39314911415855391"/>
+        <LayerSet/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <LayoutItem size="179.156,189.279,mm" referencePoint="0" isTemporal="0" zValue="7" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="112.643,4.09761,mm" frame="true" mapRotation="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="112.643,4.09761,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" positionLock="true" id="Trail Start" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <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 name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.95772328900195447" xmax="18.42354248737832023" ymax="-33.92484901666441743" xmin="18.3924263991010406"/>
+        <LayerSet/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <LayoutItem size="67.7828,166.874,mm" referencePoint="0" isTemporal="0" zValue="6" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.86559,4.09761,mm" frame="true" mapRotation="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionLock="true" id="Left inset 21KM" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <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 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 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 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 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 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 name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.94700000000000273" xmax="18.38626092146919788" ymax="-33.91681492292400435" xmin="18.37399999999999878"/>
         <LayerSet/>
         <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="113.3,76.1023,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" groupUuid="" itemRotation="0" mapRotation="0" id="Bottom inset" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="true" labelMargin="0,mm" zValue="4" positionOnPage="126.141,118.975,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="false" position="126.141,118.975,mm" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" excludeFromExports="0" followPresetName="">
-        <FrameColor red="103" green="34" alpha="255" blue="144"/>
-        <BackgroundColor red="200" green="175" alpha="255" blue="215"/>
+      <LayoutItem size="113.3,76.1023,mm" referencePoint="0" isTemporal="0" zValue="5" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="126.141,118.975,mm" frame="true" mapRotation="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="126.141,118.975,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" positionLock="true" id="Bottom inset 21KM" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="144" green="34" red="103" alpha="255"/>
+        <BackgroundColor blue="215" green="175" red="200" 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;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;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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42329132157224336" ymin="-33.9168317482614512" xmin="18.41509620662891678" ymax="-33.91132718340826813"/>
+        <Extent ymin="-33.9168317482614512" xmax="18.42329132157224336" ymax="-33.91132718340826813" xmin="18.41509620662891678"/>
         <LayerSet/>
         <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" frameJoinStyle="round" size="282.372,186.234,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" groupUuid="" itemRotation="0" mapRotation="0" id="Main Map" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="true" labelMargin="0,mm" zValue="1" positionOnPage="9.50144,5.50066,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="9.50144,5.50066,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" excludeFromExports="0" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="68.3676,117.12,mm" referencePoint="0" isTemporal="0" zValue="4" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="19.6693,7.89412,mm" frame="true" mapRotation="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" visibility="0" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="19.6693,7.89412,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" positionLock="true" id="End inset Trail" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
-                <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.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3985'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" 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.920'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.4538899796794631" ymin="-33.95900000000000318" xmin="18.36400000000000077" ymax="-33.8997143448334981"/>
+        <Extent ymin="-33.91454383501641701" xmax="18.41240136424316276" ymax="-33.90099106513847005" xmin="18.4044900556177744"/>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <LayoutItem size="63.655,88.3012,mm" referencePoint="0" isTemporal="0" zValue="3" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="170.062,49.6297,mm" frame="true" mapRotation="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" visibility="0" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="170.062,49.6297,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" positionLock="true" id="Start inset Trail" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <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 name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.94823764719958348" xmax="18.4185691326545431" ymax="-33.94253141264477591" xmin="18.41445559427620893"/>
+        <LayerSet/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <LayoutItem size="75.8756,69.7635,mm" referencePoint="0" isTemporal="0" zValue="2" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="200.321,125.314,mm" frame="true" mapRotation="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" visibility="0" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="200.321,125.314,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" positionLock="true" id="Contour inset Trail" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <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 name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.95702588572736147" xmax="18.42332635419156972" ymax="-33.94692690566557047" xmin="18.41234259163472942"/>
+        <LayerSet/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <LayoutItem size="282.372,186.234,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="9.50144,5.50066,mm" frame="true" mapRotation="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" excludeFromExports="0" frameJoinStyle="round" groupUuid="" position="9.50144,5.50066,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionLock="true" id="Main Map" opacity="1" outlineWidthM="0.15,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <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 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.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3985'&#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 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.920'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
+                </Option>
+              </Option>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.92600000000000193" xmax="18.42305800376168179" ymax="-33.89232542119508196" xmin="18.37199999999999989"/>
+        <LayerSet/>
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -30743,44 +31183,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -30803,40 +31243,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -30851,29 +31291,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -30881,34 +31321,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview name="Overview 1" position="3" blendMode="0" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" centered="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" inverted="0">
-          <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <ComposerMapOverview position="3" centered="0" show="1" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" inverted="0" blendMode="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <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">
               <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"/>
@@ -30923,9 +31363,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>
@@ -30933,9 +31373,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>
@@ -30945,61 +31385,61 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" 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~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" 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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" pageNameExpression="&quot;Distance&quot;" sortKey="&quot;Sort&quot;" hideCoverage="0" coverageLayerName="all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" coverageLayerProvider="ogr" enabled="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortAscending="1" filterFeatures="1"/>
+      <Atlas sortFeatures="1" sortKey="&quot;Sort&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerName="all_routes" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="0" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" filterFeatures="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan A1" units="mm" printResolution="120">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan A1" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -31014,49 +31454,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="594,841,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="594,841,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -31071,9 +31511,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>
@@ -31081,15 +31521,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem excludeFromExports="0" symbolHeight="4" type="65642" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" boxSpace="2" positionLock="true" equalColumnWidth="1" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="7" columnSpace="2" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="25.5925,18.7971,mm" frame="false" zValue="8" opacity="1" splitLayer="0" outlineWidthM="0.3,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="25.5925,18.7971,mm" id="" groupUuid="" rasterBorderWidth="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="miter" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" size="18.6109,9,mm" lineSpacing="1">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="false" wmsLegendWidth="50" positionOnPage="25.5925,18.7971,mm" itemRotation="0" zValue="8" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="25.5925,18.7971,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="4,4,mm" positionLock="true" frameJoinStyle="miter" background="true" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -31097,37 +31537,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="1" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" alignment="1" marginLeft="2" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="all_routes" id="all_routes20170907054841602" patch_size="0,0" legend_split_behavior="0" checked="Qt::Checked" expanded="1">
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes20170907054841602" patch_size="0,0" legend_split_behavior="0" checked="Qt::Checked" legend_exp="">
               <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>
@@ -31135,47 +31575,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="91.9494,15.0649,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="MARSHAL POSITIONS" frame="false" visibility="1" halign="1" zValue="7" positionOnPage="5.2963,808.939,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="5.2963,808.939,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="91.9494,15.0649,mm" referencePoint="0" labelText="MARSHAL POSITIONS" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.2963,808.939,mm" frame="false" marginY="1" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31190,65 +31630,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="56.6212,15.3656,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.2" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="430.403,825.052,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="430.403,825.052,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="56.6212,15.3656,mm" referencePoint="0" labelText="REVISION 1.2" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="430.403,825.052,mm" frame="false" marginY="1" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31263,65 +31703,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="114.848,15.0635,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 October 2019" frame="false" visibility="1" halign="2" zValue="4" positionOnPage="372.175,808.942,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="372.175,808.942,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="114.848,15.0635,mm" referencePoint="0" labelText="Sunday, 20 October 2019" htmlState="0" zValue="4" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="372.175,808.942,mm" frame="false" marginY="1" uuid="{d177957c-7ab6-40ae-8769-347428500538}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31336,39 +31776,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="" frameJoinStyle="miter" size="100.498,63.9757,mm" svgBorderColor="0,0,0,255" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" groupUuid="" pictureWidth="100.498" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="8" positionLock="true" frame="false" pictureHeight="58.7992" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="3" positionOnPage="489.557,775.395,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="489.557,775.395,mm" northMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="100.498,63.9757,mm" referencePoint="0" zValue="3" anchorPoint="8" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="489.557,775.395,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="58.7992" groupUuid="" pictureWidth="100.498" northMode="0" position="489.557,775.395,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -31376,42 +31816,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="481.428,0.606138,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="2" positionOnPage="5.4463,824.155,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="5.4463,824.155,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="481.428,0.606138,mm" referencePoint="0" zValue="2" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="5.4463,824.155,mm" frame="false" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -31426,90 +31866,90 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="584.759,811.213,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="3.94474,5.25965,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="3.94474,5.25965,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" excludeFromExports="0" followPresetName="Marshal overview">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="584.759,811.213,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="3.94474,5.25965,mm" frame="true" mapRotation="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal overview" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 xmax="18.42299397558693741" ymin="-33.95821655848814657" xmin="18.37434415142052657" ymax="-33.89072661913806428"/>
+        <Extent ymin="-33.95821655848814657" xmax="18.42299397558693741" ymax="-33.89072661913806428" xmin="18.37434415142052657"/>
         <LayerSet/>
         <AtlasMap margin="0" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" pageNameExpression="&quot;page&quot;" sortKey="page" hideCoverage="1" coverageLayerName="complete_marshal_overview" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayerProvider="virtual" enabled="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortAscending="1" filterFeatures="0"/>
+      <Atlas sortFeatures="1" sortKey="page" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" sortAscending="1" hideCoverage="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Access Roads" units="mm" printResolution="144">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Access Roads" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -31524,49 +31964,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -31581,27 +32021,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" position="0" page="0" units="mm"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem excludeFromExports="0" symbolHeight="4" type="65642" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" boxSpace="2" positionLock="true" equalColumnWidth="0" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="7" columnSpace="2" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="244.484,130.172,mm" frame="true" zValue="15" opacity="1" splitLayer="0" outlineWidthM="0.3,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="244.484,130.172,mm" id="" groupUuid="" rasterBorderWidth="0" maxSymbolSize="0" resizeToContents="1" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="miter" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" size="34.45,40.8,mm" lineSpacing="1">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="185" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="true" wmsLegendWidth="50" positionOnPage="244.484,130.172,mm" itemRotation="0" zValue="15" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="244.484,130.172,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="0" columnCount="1" size="34.45,40.8,mm" positionLock="true" frameJoinStyle="miter" background="true" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -31609,35 +32049,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="3" name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="3" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2.5" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" alignment="1" marginLeft="2" indent="0">
-            <styleFont style="Regular" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0" underline="0"/>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Residents Access" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Residents Access" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads">
               <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>
@@ -31645,47 +32085,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="194.851,7.272,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="ACCESS ROUTES FOR RESIDENTS" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="9.37446,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="9.37446,191.81,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="194.851,7.272,mm" referencePoint="0" labelText="ACCESS ROUTES FOR RESIDENTS" htmlState="0" zValue="8" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="9.37446,191.81,mm" frame="false" marginY="1" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="14" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31700,65 +32140,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="57.4836,6.8714,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.1" frame="false" visibility="1" halign="2" zValue="6" positionOnPage="204.225,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="204.225,191.81,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" referencePoint="0" labelText="REVISION 1.1" htmlState="0" zValue="6" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="204.225,191.81,mm" frame="false" marginY="1" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31773,65 +32213,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="51.6706,6.60801,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 October 2019" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="210.038,199.082,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="210.038,199.082,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" referencePoint="0" labelText="Sunday, 20 October 2019" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="210.038,199.082,mm" frame="false" marginY="1" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31846,39 +32286,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frameJoinStyle="miter" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" groupUuid="" pictureWidth="29.7523" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="4" positionLock="true" frame="false" pictureHeight="17.4074" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="4" positionOnPage="262.196,188.218,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="262.196,188.218,mm" northMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" referencePoint="0" zValue="4" anchorPoint="4" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="262.196,188.218,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="17.4074" groupUuid="" pictureWidth="29.7523" northMode="0" position="262.196,188.218,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -31886,42 +32326,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="251.959,0.1,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="3" positionOnPage="9.59946,198.832,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="9.59946,198.832,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="251.959,0.1,mm" referencePoint="0" zValue="3" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="9.59946,198.832,mm" frame="false" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -31936,61 +32376,61 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="67.7828,166.874,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="2" positionOnPage="5.86559,4.09761,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="5.86559,4.09761,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" excludeFromExports="0" followPresetName="Access Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="67.7828,166.874,mm" referencePoint="0" isTemporal="0" zValue="2" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.86559,4.09761,mm" frame="true" mapRotation="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Access Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" xmin="18.37288570000000121" ymax="-33.91513741583252539"/>
+        <Extent ymin="-33.94652930000000168" xmax="18.38563681624126289" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32005,45 +32445,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -32074,44 +32514,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -32134,40 +32574,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -32182,29 +32622,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -32214,43 +32654,43 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" frameJoinStyle="round" size="282.012,175.592,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="9.44946,9.08557,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="9.44946,9.08557,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" excludeFromExports="0" followPresetName="Access Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="282.012,175.592,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="9.44946,9.08557,mm" frame="true" mapRotation="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" visibility="1" excludeFromExports="0" frameJoinStyle="round" groupUuid="" position="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionLock="true" id="" opacity="1" outlineWidthM="0.15,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Access Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42303507276415431" ymin="-33.92999999999999972" xmin="18.37000000000000099" ymax="-33.89697816224119009"/>
+        <Extent ymin="-33.92999999999999972" xmax="18.42303507276415431" ymax="-33.89697816224119009" xmin="18.37000000000000099"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32265,45 +32705,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -32334,44 +32774,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -32394,40 +32834,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -32442,29 +32882,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -32474,54 +32914,54 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;" hideCoverage="1" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0" coverageLayerProvider="ogr" enabled="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0"/>
+      <Atlas sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" units="mm" printResolution="144">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Golf Course Access" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -32536,49 +32976,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -32593,59 +33033,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" position="0" page="0" units="mm"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="194.851,7.272,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginX="0" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Access to P9 Parking and VIP Tent" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="9.37446,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="9.37446,191.81,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="194.851,7.272,mm" referencePoint="0" labelText="Access to P9 Parking and VIP Tent" htmlState="0" zValue="8" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="9.37446,191.81,mm" frame="false" marginY="1" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="14" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -32660,65 +33100,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="57.4836,6.8714,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.0" frame="false" visibility="1" halign="2" zValue="6" positionOnPage="204.225,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="204.225,191.81,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="6" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="204.225,191.81,mm" frame="false" marginY="1" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -32733,65 +33173,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="51.6706,6.60801,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 October 2019" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="210.038,199.082,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="210.038,199.082,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" referencePoint="0" labelText="Sunday, 20 October 2019" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="210.038,199.082,mm" frame="false" marginY="1" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -32806,39 +33246,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="" frameJoinStyle="miter" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" groupUuid="" pictureWidth="29.7523" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="4" positionLock="true" frame="false" pictureHeight="17.4074" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="4" positionOnPage="262.196,188.218,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="262.196,188.218,mm" northMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" referencePoint="0" zValue="4" anchorPoint="4" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="262.196,188.218,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="17.4074" groupUuid="" pictureWidth="29.7523" northMode="0" position="262.196,188.218,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -32846,42 +33286,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="251.959,0.1,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="3" positionOnPage="9.59946,198.832,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="9.59946,198.832,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="251.959,0.1,mm" referencePoint="0" zValue="3" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="9.59946,198.832,mm" frame="false" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -32896,46 +33336,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>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" frameJoinStyle="round" size="282.012,182.649,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="false" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="9.44946,7.25098,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="false" position="9.44946,7.25098,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" excludeFromExports="0" followPresetName="">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="282.012,182.649,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="false" type="65639" blendMode="0" positionOnPage="9.44946,7.25098,mm" frame="false" mapRotation="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" visibility="1" excludeFromExports="0" frameJoinStyle="round" groupUuid="" position="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" positionLock="false" id="" opacity="1" outlineWidthM="0.15,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.40919746780259914" ymin="-33.90848231674397084" xmin="18.40103928699269886" ymax="-33.90319854486631357"/>
+        <Extent ymin="-33.90848231674397084" xmax="18.40919746780259914" ymax="-33.90319854486631357" xmin="18.40103928699269886"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32950,45 +33390,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -33019,44 +33459,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -33079,40 +33519,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -33127,29 +33567,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -33159,35 +33599,1215 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;" hideCoverage="1" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0" coverageLayerProvider="ogr" enabled="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0"/>
+      <Atlas sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="0"/>
+    </Layout>
+    <Layout units="mm" name="Marshal Plan Day 1" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
+      <PageCollection>
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+          <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+            <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="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"/>
+            <prop v="miter" 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="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" 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>
+        <LayoutItem size="297,420,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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>
+              <Option/>
+            </customproperties>
+          </LayoutObject>
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+            <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+              <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="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"/>
+              <prop v="miter" 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="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" 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>
+        </LayoutItem>
+        <GuideCollection visible="1"/>
+      </PageCollection>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="false" wmsLegendWidth="50" positionOnPage="15.6525,12.5708,mm" itemRotation="0" zValue="8" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="15.6525,12.5708,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="21.6797,33,mm" positionLock="true" frameJoinStyle="miter" background="true" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <styles>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          </style>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+          <style marginTop="1" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+          <style marginTop="2" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          </style>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+        </styles>
+        <layer-tree-group>
+          <customproperties>
+            <Option/>
+          </customproperties>
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
+              <customproperties>
+                <Option type="Map">
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <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>
+          </layer-tree-group>
+          <custom-order enabled="0"/>
+        </layer-tree-group>
+      </LayoutItem>
+      <LayoutItem size="45.1194,7.36972,mm" referencePoint="0" labelText="MARSHAL POSITIONS" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,399.106,mm" frame="false" marginY="1" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,399.106,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="16.2476,7.80192,mm" referencePoint="0" labelText="Page [% &quot;page&quot; %]" htmlState="0" zValue="6" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,406.988,mm" frame="false" marginY="1" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,406.988,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="27.7839,7.51682,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="214.292,406.988,mm" frame="false" marginY="1" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="214.292,406.988,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="56.3557,7.36902,mm" referencePoint="0" labelText="[%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;%]" htmlState="0" zValue="4" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="185.72,399.107,mm" frame="false" marginY="1" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="185.72,399.107,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="49.3143,31.2967,mm" referencePoint="0" zValue="3" anchorPoint="8" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="243.319,382.696,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="28.8527" groupUuid="" pictureWidth="49.3143" northMode="0" position="243.319,382.696,mm" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
+                </Option>
+              </Option>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutItem>
+      <LayoutItem size="236.083,0.14328,mm" referencePoint="0" zValue="2" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="5.84321,406.626,mm" frame="false" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.84321,406.626,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+          <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+            <Option type="Map">
+              <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"/>
+            <prop v="miter" 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="0,0,0,255" k="outline_color"/>
+            <prop v="solid" k="outline_style"/>
+            <prop v="0.3" 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>
+      </LayoutItem>
+      <LayoutItem size="286.94,392.396,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.03,5.9483,mm" frame="false" mapRotation="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.03,5.9483,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal overview" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <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 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 name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
+                </Option>
+              </Option>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.93775368136344639" xmax="18.40978433395395442" ymax="-33.91465407864861703" xmin="18.3928927268106257"/>
+        <LayerSet/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <customproperties>
+        <Option type="Map">
+          <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~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1~~~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>
+      </customproperties>
+      <Atlas sortFeatures="1" sortKey="page" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" filterFeatures="1" featureFilter="regexp_match( &quot;day&quot;, '1' )" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" enabled="1"/>
+    </Layout>
+    <Layout units="mm" name="Marshal Plan Day 2" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
+      <PageCollection>
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+          <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+            <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="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"/>
+            <prop v="miter" 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="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" 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>
+        <LayoutItem size="297,420,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{1d6ee08b-2bae-454e-9747-92fe53ff794e}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{1d6ee08b-2bae-454e-9747-92fe53ff794e}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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>
+              <Option/>
+            </customproperties>
+          </LayoutObject>
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+            <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+              <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="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"/>
+              <prop v="miter" 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="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" 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>
+        </LayoutItem>
+        <GuideCollection visible="1"/>
+      </PageCollection>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{80d2d637-cb6b-4919-8d13-8e8608fc27b9}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="false" wmsLegendWidth="50" positionOnPage="15.6525,12.5708,mm" itemRotation="0" zValue="8" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="15.6525,12.5708,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="21.6797,33,mm" positionLock="true" frameJoinStyle="miter" background="true" map_uuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{80d2d637-cb6b-4919-8d13-8e8608fc27b9}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <styles>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          </style>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+          <style marginTop="1" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+          <style marginTop="2" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          </style>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+        </styles>
+        <layer-tree-group>
+          <customproperties>
+            <Option/>
+          </customproperties>
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
+              <customproperties>
+                <Option type="Map">
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <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>
+          </layer-tree-group>
+          <custom-order enabled="0"/>
+        </layer-tree-group>
+      </LayoutItem>
+      <LayoutItem size="45.1194,7.36972,mm" referencePoint="0" labelText="MARSHAL POSITIONS" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,399.106,mm" frame="false" marginY="1" uuid="{21317d02-e72f-414d-80e6-3dc4704f496e}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,399.106,mm" templateUuid="{21317d02-e72f-414d-80e6-3dc4704f496e}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="16.2476,7.80192,mm" referencePoint="0" labelText="Page [% &quot;page&quot; %]" htmlState="0" zValue="6" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,406.988,mm" frame="false" marginY="1" uuid="{043d6b93-d56f-4b5b-943a-bae20902ecc2}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,406.988,mm" templateUuid="{043d6b93-d56f-4b5b-943a-bae20902ecc2}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="27.7839,7.51682,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="214.292,406.988,mm" frame="false" marginY="1" uuid="{767bf4e2-dd2d-40bf-a1a1-2a0799413ce0}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="214.292,406.988,mm" templateUuid="{767bf4e2-dd2d-40bf-a1a1-2a0799413ce0}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="93.5757,7.36902,mm" referencePoint="0" labelText="[%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;%]" htmlState="0" zValue="4" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="148.5,399.107,mm" frame="false" marginY="1" uuid="{d293ba25-5164-4566-9ce7-61cb613b0bc1}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="148.5,399.107,mm" templateUuid="{d293ba25-5164-4566-9ce7-61cb613b0bc1}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="49.3143,31.2967,mm" referencePoint="0" zValue="3" anchorPoint="8" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="243.319,382.696,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{b3ed3305-8f0b-47bc-81b5-23c34cc7f4e9}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="28.8527" groupUuid="" pictureWidth="49.3143" northMode="0" position="243.319,382.696,mm" templateUuid="{b3ed3305-8f0b-47bc-81b5-23c34cc7f4e9}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
+                </Option>
+              </Option>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutItem>
+      <LayoutItem size="236.083,0.14328,mm" referencePoint="0" zValue="2" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="5.84321,406.626,mm" frame="false" uuid="{a24294c4-895b-4801-b08b-9e3763b298cf}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.84321,406.626,mm" templateUuid="{a24294c4-895b-4801-b08b-9e3763b298cf}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+          <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+            <Option type="Map">
+              <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"/>
+            <prop v="miter" 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="0,0,0,255" k="outline_color"/>
+            <prop v="solid" k="outline_style"/>
+            <prop v="0.3" 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>
+      </LayoutItem>
+      <LayoutItem size="286.94,392.396,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.03,5.9483,mm" frame="false" mapRotation="0" uuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.03,5.9483,mm" templateUuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal overview" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <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 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 name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
+                </Option>
+              </Option>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.94797288016832226" xmax="18.38613924055453452" ymax="-33.9248732774534929" xmin="18.36924763341120581"/>
+        <LayerSet/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <customproperties>
+        <Option type="Map">
+          <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~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1~~~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>
+      </customproperties>
+      <Atlas sortFeatures="1" sortKey="page" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" filterFeatures="1" featureFilter="regexp_match( &quot;day&quot;, '2' )" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" enabled="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmax="18.53236032035363223" ymin="-33.99333812871999072" xmin="18.3729499167874053" ymax="-33.90758844505358383">
+    <DefaultViewExtent ymin="-33.95282887119950033" xmax="18.45882209706136834" ymax="-33.88874265129132368" xmin="18.33968451262036226">
       <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>
@@ -33201,10 +34821,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db">
+  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings cumulativeTemporalRange="0" frameRate="1" timeStep="1" timeStepUnit="h"/>
+  <ProjectTimeSettings timeStep="1" timeStepUnit="h" frameRate="1" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
@@ -33213,29 +34833,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.mldata b/GIS Base Map/Gun Run.qgs.mldata
index e83ebe9..1e61bab 100644
Binary files a/GIS Base Map/Gun Run.qgs.mldata and b/GIS Base Map/Gun Run.qgs.mldata differ
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 06c669b..78ab1a8 100644
--- a/GIS Base Map/Gun Run.qgs~	
+++ b/GIS Base Map/Gun Run.qgs~	
@@ -1,5 +1,5 @@
 <!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
-<qgis saveUser="tim" saveDateTime="2022-07-27T13:12:43" version="3.26.1-Buenos Aires" saveUserFull="Timothy Allen" projectname="Gun Run">
+<qgis saveUser="tim" projectname="Gun Run" version="3.26.1-Buenos Aires" saveDateTime="2022-08-19T13:41:54" saveUserFull="Timothy Allen">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,98 +21,211 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group name="Marshals" checked="Qt::Unchecked" groupLayer="" expanded="0">
+    <layer-tree-group expanded="1" name="Marshals" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_exp="" name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" legend_split_behavior="0" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="marshal_positions" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./marshal_positions.shp|layername=marshal_positions">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="cached_name" value="marshal_positions" 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 legend_exp="" name="extra_security" id="extra_security20170921130834191" patch_size="0,0" legend_split_behavior="0" source="./extra_security.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="extra_security" id="extra_security20170921130834191" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./extra_security.shp">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="marshals_by_position" id="marshals_by_position20161003112326575" patch_size="0,0" legend_split_behavior="0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" providerKey="delimitedtext" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="complete_marshal_overview" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" providerKey="virtual" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="marshal_overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" legend_split_behavior="0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" providerKey="ogr" expanded="0">
+      <layer-tree-layer expanded="1" name="marshals_by_position" id="marshals_by_position20161003112326575" patch_size="0,0" legend_split_behavior="0" providerKey="delimitedtext" checked="Qt::Unchecked" legend_exp="" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="cached_name" value="marshals_by_position" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="complete_marshal_overview" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" legend_split_behavior="0" providerKey="virtual" checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="0" name="marshal_overviews" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./marshal overviews.shp|layername=marshal overviews">
+        <customproperties>
+          <Option type="Map">
+            <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 name="Fencing and Cones" checked="Qt::Unchecked" groupLayer="" expanded="0">
+    <layer-tree-group expanded="0" name="Fencing and Cones" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_exp="" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing">
         <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="cached_name" value="fencing" 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 legend_exp="" name="fence_groups" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" patch_size="0,0" legend_split_behavior="0" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual" expanded="1">
+      <layer-tree-layer expanded="1" name="fence_groups" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" patch_size="0,0" legend_split_behavior="0" providerKey="virtual" checked="Qt::Unchecked" legend_exp="" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" checked="Qt::Checked" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group name="Markers" checked="Qt::Checked" groupLayer="" expanded="1">
+      <layer-tree-group expanded="1" name="Markers" groupLayer="" checked="Qt::Unchecked">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer legend_exp="" name="route_markers" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" patch_size="-1,-1" legend_split_behavior="0" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={b44a1939-247b-4566-889e-a31ad931ccdc}" checked="Qt::Checked" providerKey="memory" expanded="1">
+        <layer-tree-layer expanded="1" name="route_markers" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" patch_size="-1,-1" legend_split_behavior="0" providerKey="memory" 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=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(4,0)&amp;uid={56882179-64ce-409f-a00e-427b24f6e9d7}">
           <customproperties>
             <Option type="Map">
-              <Option value="1" name="showFeatureCount" type="int"/>
+              <Option name="showFeatureCount" value="1" type="int"/>
             </Option>
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer legend_exp="" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
         <customproperties>
           <Option type="Map">
+            <Option name="cached_name" value="all_routes" type="QString"/>
             <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 legend_exp="" name="timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" legend_split_behavior="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " checked="Qt::Unchecked" providerKey="ogr" expanded="0">
+    <layer-tree-layer expanded="0" name="timelapse" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" 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' ">
       <customproperties>
-        <Option/>
+        <Option type="Map">
+          <Option name="cached_name" value="timelapse" type="QString"/>
+        </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group name="Feeding Stations" checked="Qt::Unchecked" groupLayer="" expanded="1">
+    <layer-tree-group expanded="1" name="Feeding Stations" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_exp="" name="water_tables" id="water_tables20170921142016467" patch_size="0,0" legend_split_behavior="0" source="./water_tables.shp" checked="Qt::Checked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="water_tables" id="water_tables20170921142016467" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./water_tables.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="water_tables" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" name="Ask Me" groupLayer="" checked="Qt::Unchecked">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="1" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./poi_labels.shp|layername=poi_labels">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="poi_labels" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="directions_to_start" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" name="Residents Access" groupLayer="" checked="Qt::Unchecked">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="1" name="mayor" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./mayor.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="mayor" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="viplabels" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./viplabels.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="viplabels" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="vipaccess" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./vipaccess.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="vipaccess" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="0" name="golfaccess" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./golfaccess.shp">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="residents_access_roads" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./residents_access.shp|layername=residents_access">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="1" name="OSM data" groupLayer="" checked="Qt::Checked">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="0" name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./osm_roads.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="osm_roads [3887]" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./osm_places.shp|layername=osm_places">
+        <customproperties>
+          <Option type="Map">
+            <Option name="cached_name" value="osm_places [7]" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" name="Start and Finish pages" groupLayer="" checked="Qt::Unchecked">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="1" name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./data-comments.shp">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./start_finish_area.shp">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -120,124 +233,34 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Ask Me" checked="Qt::Unchecked" groupLayer="" expanded="0">
+    <layer-tree-group expanded="0" name="Elevation" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_exp="" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Residents Access" checked="Qt::Unchecked" groupLayer="" expanded="0">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer legend_exp="" name="mayor" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" legend_split_behavior="0" source="./mayor.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="viplabels" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" legend_split_behavior="0" source="./viplabels.shp" checked="Qt::Checked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="vipaccess" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" legend_split_behavior="0" source="./vipaccess.shp" checked="Qt::Checked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="golfaccess" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" legend_split_behavior="0" source="./golfaccess.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="0">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="1" name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Unchecked" legend_exp="" source="./capetownelevation-1m.shp">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="residents_access" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" legend_split_behavior="0" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="OSM data" checked="Qt::Checked" groupLayer="" expanded="1">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer legend_exp="" name="osm_roads" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" legend_split_behavior="0" source="./osm_roads.shp" checked="Qt::Checked" providerKey="ogr" expanded="0">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="osm_places" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" legend_split_behavior="0" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" providerKey="ogr" expanded="1">
-        <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 name="Start and Finish pages" checked="Qt::Unchecked" groupLayer="" expanded="0">
+    <layer-tree-group expanded="1" name="Map" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer legend_exp="" name="data-comments" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" legend_split_behavior="0" source="./data-comments.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
+      <layer-tree-layer expanded="0" name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" legend_split_behavior="0" providerKey="gdal" checked="Qt::Checked" legend_exp="" source="./GDAL-City of Cape Town 2015 Aerial.xml">
         <customproperties>
           <Option type="Map">
+            <Option name="cached_name" value="GDAL-City of Cape Town 2015 Aerial" type="QString"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="start_finish_area" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" legend_split_behavior="0" source="./start_finish_area.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Elevation" checked="Qt::Unchecked" groupLayer="" expanded="0">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer legend_exp="" name="capetownelevation-1m" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" legend_split_behavior="0" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" providerKey="ogr" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option value="1" name="showFeatureCount" type="QString"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Map" checked="Qt::Checked" groupLayer="" expanded="1">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" legend_split_behavior="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Unchecked" providerKey="gdal" expanded="1">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer legend_exp="" name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" legend_split_behavior="0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" providerKey="wms" expanded="1">
+      <layer-tree-layer expanded="1" name="Outlines" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" legend_split_behavior="0" providerKey="wms" 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">
         <customproperties>
           <Option type="Map">
+            <Option name="cached_name" value="Outlines" type="QString"/>
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
@@ -268,34 +291,35 @@
       <item>viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0</item>
       <item>fence_groups_cbaea960_3348_4aea_b155_46e5d310f792</item>
       <item>mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea</item>
-      <item>route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8</item>
+      <item>route_markers_6943d827_bf32_40af_988d_60a736c1d3e1</item>
+      <item>marshals_by_position20161003112326575</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings unit="1" tolerance="10" minScale="0" self-snapping="1" type="1" mode="3" maxScale="0" intersection-snapping="1" enabled="1" scaleDependencyMode="0">
+  <snapping-settings intersection-snapping="1" maxScale="0" scaleDependencyMode="0" minScale="0" unit="1" tolerance="10" type="1" enabled="0" mode="3" self-snapping="1">
     <individual-layer-settings>
-      <layer-setting tolerance="12" minScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" type="1" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="20" minScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" type="2" maxScale="0" enabled="1" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" type="0" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="0" minScale="0" id="water_tables20170921142016467" type="2" maxScale="0" enabled="0" units="2"/>
-      <layer-setting tolerance="12" minScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" type="1" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" type="1" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" type="1" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="0" minScale="0" id="extra_security20170921130834191" type="2" maxScale="0" enabled="0" units="2"/>
-      <layer-setting tolerance="12" minScale="0" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" type="2" maxScale="0" enabled="0" units="1"/>
-      <layer-setting tolerance="12" minScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" type="2" maxScale="0" enabled="0" units="1"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="2" maxScale="0" minScale="0" id="extra_security20170921130834191" tolerance="0" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" type="1" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" type="1" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" type="1" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" type="1" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" tolerance="12" type="0" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" type="2" enabled="1"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="1" maxScale="0" minScale="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" type="2" enabled="0"/>
+      <layer-setting units="2" maxScale="0" minScale="0" id="water_tables20170921142016467" tolerance="0" type="2" enabled="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -303,10 +327,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.3729499167874053</xmin>
-      <ymin>-33.97819360374913344</ymin>
-      <xmax>18.53236032035363223</xmax>
-      <ymax>-33.9227329700244411</ymax>
+      <xmin>18.37202099282994183</xmin>
+      <ymin>-33.95282887119950033</ymin>
+      <xmax>18.42648561685178876</xmax>
+      <ymax>-33.88874265129132368</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -327,161 +351,161 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" open="false" checked="Qt::Unchecked">
-      <legendlayer name="marshal_positions" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+    <legendgroup name="Marshals" checked="Qt::Checked" open="true">
+      <legendlayer name="marshal_positions" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="extra_security" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="extra_security" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="marshals_by_position" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="marshals_by_position" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="complete_marshal_overview" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="marshal_overviews" showFeatureCount="0" drawingOrder="-1" open="false" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="false">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" open="false" checked="Qt::Unchecked">
-      <legendlayer name="fencing" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
+      <legendlayer name="fencing" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="fence_groups" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="fence_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" open="true" checked="Qt::Checked">
-      <legendgroup name="Markers" open="true" checked="Qt::Checked">
-        <legendlayer name="route_markers" showFeatureCount="1" drawingOrder="-1" open="true" checked="Qt::Checked">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
+    <legendgroup name="Routes" checked="Qt::Checked" open="true">
+      <legendgroup name="Markers" checked="Qt::Unchecked" open="true">
+        <legendlayer name="route_markers" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile visible="0" isInOverview="0" layerid="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer name="all_routes" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="all_routes" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer name="timelapse" showFeatureCount="0" drawingOrder="-1" open="false" checked="Qt::Unchecked">
-      <filegroup open="false" hidden="false">
+    <legendlayer name="timelapse" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="false">
+      <filegroup hidden="false" open="false">
         <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup name="Feeding Stations" open="true" checked="Qt::Unchecked">
-      <legendlayer name="water_tables" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Feeding Stations" checked="Qt::Unchecked" open="true">
+      <legendlayer name="water_tables" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" open="false" checked="Qt::Unchecked">
-      <legendlayer name="poi_labels" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
+      <legendlayer name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="directions_to_start" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" open="false" checked="Qt::Unchecked">
-      <legendlayer name="mayor" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
+      <legendlayer name="mayor" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="viplabels" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="viplabels" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="vipaccess" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="vipaccess" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="golfaccess" showFeatureCount="0" drawingOrder="-1" open="false" checked="Qt::Unchecked">
-        <filegroup open="false" hidden="false">
+      <legendlayer name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="false">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="residents_access_roads" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="residents_access" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="residents_access" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" open="true" checked="Qt::Checked">
-      <legendlayer name="osm_roads" showFeatureCount="1" drawingOrder="-1" open="false" checked="Qt::Checked">
-        <filegroup open="false" hidden="false">
+    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
+      <legendlayer name="osm_roads" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="false">
+        <filegroup hidden="false" open="false">
           <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="osm_places" showFeatureCount="1" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="osm_places" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" open="false" checked="Qt::Unchecked">
-      <legendlayer name="data-comments" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="false">
+      <legendlayer name="data-comments" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="start_finish_area" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Elevation" open="false" checked="Qt::Unchecked">
-      <legendlayer name="capetownelevation-1m" showFeatureCount="1" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
+    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
+      <legendlayer name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" open="true" checked="Qt::Checked">
-      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Unchecked">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile visible="0" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+    <legendgroup name="Map" checked="Qt::Checked" open="true">
+      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer name="Outlines" showFeatureCount="0" drawingOrder="-1" open="true" checked="Qt::Checked">
-        <filegroup open="true" hidden="false">
+      <legendlayer name="Outlines" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1" open="true">
+        <filegroup hidden="false" open="true">
           <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer refreshOnNotifyMessage="" legendPlaceholderImage="" autoRefreshTime="0" autoRefreshEnabled="0" type="annotation" refreshOnNotifyEnabled="0">
+  <main-annotation-layer autoRefreshEnabled="0" autoRefreshTime="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" type="annotation" legendPlaceholderImage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -532,7 +556,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" legendPlaceholderImage="" autoRefreshTime="0" autoRefreshEnabled="0" type="raster" maxScale="100000" refreshOnNotifyEnabled="0">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" maxScale="100000" minScale="1e+08" autoRefreshTime="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="raster" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -597,7 +621,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -622,58 +646,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" fetchMode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" symbology="Line" band="1" enabled="0" zscale="1">
+      <elevation zoffset="0" symbology="Line" zscale="1" enabled="0" band="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -704,36 +728,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -748,9 +772,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>
@@ -759,27 +783,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 zoomedOutResamplingMethod="nearestNeighbour" enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer redBand="1" nodataColor="" blueBand="3" greenBand="2" type="multibandcolor" alphaBand="-1" opacity="0.5">
+        <rasterrenderer opacity="0.5" redBand="1" alphaBand="-1" blueBand="3" nodataColor="" type="multibandcolor" greenBand="2">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -790,14 +814,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation saturation="0" colorizeStrength="100" colorizeRed="255" colorizeBlue="128" invertColors="0" colorizeGreen="128" colorizeOn="0" grayscaleMode="0"/>
+        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
+        <huesaturation colorizeBlue="128" colorizeStrength="100" invertColors="0" grayscaleMode="0" colorizeRed="255" saturation="0" colorizeGreen="128" colorizeOn="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" legendPlaceholderImage="" autoRefreshTime="0" autoRefreshEnabled="0" type="raster" maxScale="0" refreshOnNotifyEnabled="0">
+    <maplayer hasScaleBasedVisibilityFlag="0" autoRefreshEnabled="0" maxScale="0" minScale="1e+08" autoRefreshTime="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" type="raster" legendPlaceholderImage="">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -862,7 +886,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -885,58 +909,58 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" fetchMode="0" enabled="0">
+      <temporal fetchMode="0" enabled="0" mode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" symbology="Line" band="1" enabled="0" zscale="1">
+      <elevation zoffset="0" symbology="Line" zscale="1" enabled="0" band="1">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -967,36 +991,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -1011,9 +1035,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>
@@ -1022,27 +1046,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 zoomedOutResamplingMethod="nearestNeighbour" enabled="false" zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2"/>
         </provider>
-        <rasterrenderer nodataColor="" type="singlebandcolordata" alphaBand="-1" band="1" opacity="0.75">
+        <rasterrenderer opacity="0.75" alphaBand="-1" nodataColor="" type="singlebandcolordata" band="1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1053,23 +1077,23 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
-        <huesaturation saturation="0" colorizeStrength="100" colorizeRed="255" colorizeBlue="128" invertColors="0" colorizeGreen="128" colorizeOn="0" grayscaleMode="0"/>
+        <brightnesscontrast contrast="0" brightness="0" gamma="1"/>
+        <huesaturation colorizeBlue="128" colorizeStrength="100" invertColors="0" grayscaleMode="0" colorizeRed="255" saturation="0" colorizeGreen="128" colorizeOn="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
-        <ymin>-33.95649000000000228</ymin>
+        <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
         <ymax>-33.89943083574347327</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.37527226735897301</xmin>
-        <ymin>-33.95649000000000228</ymin>
+        <ymin>-33.95648400000000322</ymin>
         <xmax>18.42291227690369482</xmax>
         <ymax>-33.89943083574347327</ymax>
       </wgs84extent>
@@ -1125,7 +1149,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1139,8 +1163,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field name="length_m" comment="" precision="0" length="6" expression="$length" typeName="integer" type="2" subType="0"/>
-        <field name="length_km" comment="" precision="0" length="-1" expression="$length / 1000" typeName="double precision" type="6" subType="0"/>
+        <field expression="$length" typeName="integer" name="length_m" precision="0" comment="" subType="0" length="6" type="2"/>
+        <field expression="$length / 1000" typeName="double precision" name="length_km" precision="0" comment="" subType="0" length="-1" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1153,58 +1177,58 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="RouteLen" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="RouteLen" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -1235,36 +1259,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -1279,44 +1303,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -1339,52 +1363,53 @@
               <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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" description="Only show when active in Atlas" symbol="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" label="Active Routes">
-            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" symbol="1" filter="&quot;Source&quot; = '21KM'" label="21KM" checkstate="0"/>
-            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" description="This should be disabled, since it's only for legends" symbol="2" filter="&quot;Source&quot; = '10KM'" label="10KM" checkstate="0"/>
-            <rule key="{871a9276-8278-4528-911c-7e434c0885d3}" description="This should be disabled, since it's only for legends" symbol="3" filter="&quot;Source&quot; = '5KM'" label="5KM" checkstate="0"/>
-            <rule key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" description="This should be disabled, since it's only for legends" symbol="4" filter="&quot;Source&quot; = 'Trail'" label="Trail" checkstate="0"/>
+          <rule checkstate="0" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0" label="Active Routes" description="Only show when active in Atlas">
+            <rule checkstate="0" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1" label="21KM" description="This should be disabled, since it's only for legends"/>
+            <rule checkstate="0" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2" label="10KM" description="This should be disabled, since it's only for legends"/>
+            <rule checkstate="0" filter="&quot;Source&quot; = '5KM'" key="{871a9276-8278-4528-911c-7e434c0885d3}" symbol="3" label="5KM" description="This should be disabled, since it's only for legends"/>
+            <rule checkstate="0" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="4" label="Trail" description="This should be disabled, since it's only for legends"/>
           </rule>
-          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="5" label="Always show" checkstate="0"/>
+          <rule checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="5" label="Always show"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="6" label="Show by day"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -1404,44 +1429,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 name="@0@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -1457,32 +1482,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 name="@@0@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@0@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -1497,15 +1522,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>
@@ -1515,33 +1540,33 @@
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -1572,36 +1597,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">
               <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"/>
@@ -1621,40 +1646,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 name="@0@2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -1677,15 +1702,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="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>
@@ -1693,22 +1718,22 @@
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -1728,40 +1753,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 name="@0@3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -1784,47 +1809,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -1844,44 +1869,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 name="@1@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -1897,32 +1922,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 name="@@1@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -1937,15 +1962,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>
@@ -1955,33 +1980,33 @@
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -2012,36 +2037,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">
               <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"/>
@@ -2061,40 +2086,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 name="@1@2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2117,15 +2142,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>
@@ -2133,22 +2158,22 @@
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -2168,40 +2193,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 name="@1@3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2224,47 +2249,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 name="2" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -2284,44 +2309,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 name="@2@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2337,32 +2362,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 name="@@2@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -2377,15 +2402,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>
@@ -2395,33 +2420,33 @@
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -2452,36 +2477,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">
               <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"/>
@@ -2501,40 +2526,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 name="@2@2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2557,15 +2582,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>
@@ -2573,22 +2598,22 @@
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -2608,40 +2633,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 name="@2@3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2664,47 +2689,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 name="3" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -2724,44 +2749,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 name="@3@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2777,32 +2802,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 name="@@3@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@3@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -2817,15 +2842,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>
@@ -2835,33 +2860,33 @@
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -2892,36 +2917,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">
               <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"/>
@@ -2941,40 +2966,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 name="@3@2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -2997,15 +3022,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>
@@ -3013,22 +3038,22 @@
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -3048,40 +3073,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 name="@3@3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -3104,47 +3129,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 name="4" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -3164,44 +3189,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 name="@4@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -3217,32 +3242,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 name="@@4@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@4@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -3257,15 +3282,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>
@@ -3275,33 +3300,33 @@
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -3332,36 +3357,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">
               <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"/>
@@ -3381,40 +3406,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 name="@4@2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -3437,15 +3462,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>
@@ -3453,22 +3478,22 @@
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -3488,40 +3513,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 name="@4@3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@4@3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -3544,58 +3569,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 name="5" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -3626,15 +3651,95 @@
               <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 name="6" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
+            <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 locked="0" pass="0" class="SimpleLine" enabled="1">
+              <Option type="Map">
+                <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"/>
+              <prop v="5;2" k="customdash"/>
+              <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+              <prop v="MM" k="customdash_unit"/>
+              <prop v="0" k="dash_pattern_offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="dash_pattern_offset_map_unit_scale"/>
+              <prop v="MM" k="dash_pattern_offset_unit"/>
+              <prop v="0" k="draw_inside_polygon"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="0,0,0,255" k="line_color"/>
+              <prop v="solid" k="line_style"/>
+              <prop v="0.46" k="line_width"/>
+              <prop v="MM" k="line_width_unit"/>
+              <prop v="0" k="offset"/>
+              <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+              <prop v="MM" k="offset_unit"/>
+              <prop v="0" k="ring_filter"/>
+              <prop v="0" k="trim_distance_end"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_end_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_end_unit"/>
+              <prop v="0" k="trim_distance_start"/>
+              <prop v="3x:0,0,0,0,0,0" k="trim_distance_start_map_unit_scale"/>
+              <prop v="MM" k="trim_distance_start_unit"/>
+              <prop v="0" k="tweak_dash_pattern_on_corners"/>
+              <prop v="0" k="use_custom_dash"/>
+              <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+              <data_defined_properties>
+                <Option type="Map">
+                  <Option name="name" value="" type="QString"/>
+                  <Option name="properties" type="Map">
+                    <Option name="outlineColor" type="Map">
+                      <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 name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3645,43 +3750,43 @@
         </orderby>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{0ba56ba6-21a8-4c4c-9148-41f946721f2a}">
-          <rule key="{4f8efdda-7a44-4a18-ab72-9bbcbcdbd62c}" active="0" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+        <rules key="{4378179d-f926-41f4-9594-bdfa682c8a9f}">
+          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{573bc779-5c0e-4f9d-97f0-32cc9764b982}" description="Active routes">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="round($length / 1000, 0)" fontItalic="0">
+              <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="round($length / 1000, 0)" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="0,0,0,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="markerSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <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">
                       <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"/>
@@ -3704,34 +3809,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 name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -3746,98 +3851,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="3" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="km_marker()" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="0" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="1" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="LineGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="LineGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="1" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="3" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="0" geometryGenerator="km_marker()" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -3846,9 +3951,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"/>
@@ -3856,8 +3961,12 @@
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option 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>
@@ -3866,47 +3975,47 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -3937,9 +4046,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>
@@ -3947,12 +4056,12 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -3967,8 +4076,8 @@
           <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>
@@ -3977,8 +4086,8 @@
           <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>
@@ -3987,8 +4096,8 @@
           <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>
@@ -3997,8 +4106,8 @@
           <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>
@@ -4007,8 +4116,8 @@
           <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>
@@ -4017,8 +4126,8 @@
           <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>
@@ -4027,8 +4136,8 @@
           <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>
@@ -4037,14 +4146,21 @@
           <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 name="Sort" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="day" configurationFlags="None">
+          <editWidget type="Range">
             <config>
               <Option/>
             </config>
@@ -4054,8 +4170,8 @@
           <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>
@@ -4064,8 +4180,8 @@
           <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>
@@ -4081,69 +4197,74 @@
         <alias name="" field="RouteLen" index="6"/>
         <alias name="" field="Source" index="7"/>
         <alias name="" field="Sort" index="8"/>
-        <alias name="" field="length_m" index="9"/>
-        <alias name="" field="length_km" index="10"/>
+        <alias name="" field="day" index="9"/>
+        <alias name="" field="length_m" index="10"/>
+        <alias name="" field="length_km" index="11"/>
       </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="length_m" expression="" applyOnUpdate="0"/>
-        <default field="length_km" expression="" applyOnUpdate="0"/>
+        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default expression="" field="descriptio" applyOnUpdate="0"/>
+        <default expression="" field="timestamp" applyOnUpdate="0"/>
+        <default expression="" field="begin" applyOnUpdate="0"/>
+        <default expression="" field="end" applyOnUpdate="0"/>
+        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default expression="" field="RouteLen" applyOnUpdate="0"/>
+        <default expression="" field="Source" applyOnUpdate="0"/>
+        <default expression="" field="Sort" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
+        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Sort" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="Sort" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="length_m" comment="" precision="0" length="6" expression="$length" typeName="integer" type="2" subType="0"/>
-        <field name="length_km" comment="" precision="0" length="-1" expression="$length / 1000" typeName="double precision" type="6" subType="0"/>
+        <field expression="$length" typeName="integer" name="length_m" precision="0" comment="" subType="0" length="6" type="2"/>
+        <field expression="$length / 1000" typeName="double precision" name="length_km" precision="0" comment="" subType="0" length="-1" type="6"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Name&quot;">
         <columns>
-          <column width="152" name="Name" type="field" hidden="0"/>
-          <column width="-1" name="descriptio" type="field" hidden="0"/>
-          <column width="-1" name="timestamp" type="field" hidden="0"/>
-          <column width="163" name="begin" type="field" hidden="0"/>
-          <column width="-1" name="end" type="field" hidden="0"/>
-          <column width="-1" name="Distance" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="RouteLen" type="field" hidden="0"/>
-          <column width="-1" name="Source" type="field" hidden="0"/>
-          <column width="-1" name="length_m" type="field" hidden="0"/>
-          <column width="-1" name="Sort" type="field" hidden="0"/>
-          <column width="-1" name="length_km" type="field" hidden="0"/>
+          <column width="152" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="163" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column width="-1" name="Sort" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4175,23 +4296,27 @@ 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="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 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"/>
@@ -4202,8 +4327,10 @@ def my_form_open(dialog, layer, feature):
         <field reuseLastValue="0" name="Distance"/>
         <field reuseLastValue="0" name="Name"/>
         <field reuseLastValue="0" name="RouteLen"/>
+        <field reuseLastValue="0" name="Sort"/>
         <field reuseLastValue="0" name="Source"/>
         <field reuseLastValue="0" name="begin"/>
+        <field reuseLastValue="0" name="day"/>
         <field reuseLastValue="0" name="descriptio"/>
         <field reuseLastValue="0" name="end"/>
         <field reuseLastValue="0" name="length_km"/>
@@ -4215,7 +4342,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -4288,58 +4415,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -4370,36 +4497,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -4414,44 +4541,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -4474,54 +4601,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -4552,9 +4679,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>
@@ -4565,9 +4692,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>
       </customproperties>
       <blendMode>0</blendMode>
@@ -4608,23 +4735,23 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="elevation" index="2"/>
       </aliases>
       <defaults>
-        <default field="ID" expression="" applyOnUpdate="0"/>
-        <default field="height" expression="" applyOnUpdate="0"/>
-        <default field="elevation" expression="" applyOnUpdate="0"/>
+        <default expression="" field="ID" applyOnUpdate="0"/>
+        <default expression="" field="height" applyOnUpdate="0"/>
+        <default expression="" field="elevation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="ID" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="height" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="elevation" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="ID" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="height" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="elevation" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint field="ID" desc="" exp=""/>
+        <constraint field="height" desc="" exp=""/>
+        <constraint field="elevation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
@@ -4649,17 +4776,17 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="Polygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.94678832168284544</ymin>
-        <xmax>18.42124635930919041</xmax>
+        <ymin>-33.95871753779982782</ymin>
+        <xmax>18.42424810950425851</xmax>
         <ymax>-33.8965939968351222</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.94678832168284544</ymin>
-        <xmax>18.42124635930919041</xmax>
+        <ymin>-33.95871753779982782</ymin>
+        <xmax>18.42424810950425851</xmax>
         <ymax>-33.8965939968351222</ymax>
       </wgs84extent>
       <id>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</id>
@@ -4724,58 +4851,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -4806,36 +4933,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -4850,44 +4977,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -4910,38 +5037,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -4956,9 +5083,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>
@@ -4969,9 +5096,9 @@ 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>
@@ -5007,30 +5134,41 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="day" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias name="" field="id" index="0"/>
         <alias name="" field="type" index="1"/>
         <alias name="" field="page" index="2"/>
+        <alias name="" field="day" index="3"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="page" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="page" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="page" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
@@ -5055,7 +5193,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5120,7 +5258,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5145,58 +5283,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -5227,36 +5365,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -5271,44 +5409,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -5331,54 +5469,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -5409,9 +5547,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>
@@ -5422,32 +5560,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="Name" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="Name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -5462,67 +5600,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="5" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="2" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="LineGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="LineGeometry" xOffset="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="4" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="2" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="5" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -5531,47 +5669,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -5602,9 +5740,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>
@@ -5612,12 +5750,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -5648,26 +5786,26 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="Name" index="1"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="Name" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="Name" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Name" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="Name" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5699,8 +5837,8 @@ 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 name="Name" labelOnTop="0"/>
@@ -5712,7 +5850,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5777,7 +5915,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5802,58 +5940,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -5884,36 +6022,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -5928,44 +6066,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -5988,48 +6126,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule key="{85adf11b-f941-44b6-8847-c828ab845cdc}" description="Only show when active in Atlas" symbol="0" filter="&quot;distance&quot; = '21KM'" label="21KM"/>
-          <rule key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" description="Only show when active in Atlas" symbol="1" filter="&quot;distance&quot; = '10KM'" label="10KM"/>
-          <rule key="{cf733f0f-ab72-441e-b213-841aa39c1671}" description="Only show when active in Atlas" symbol="2" filter="&quot;distance&quot; = '5KM'" label="5KM"/>
+          <rule filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0" label="21KM" description="Only show when active in Atlas"/>
+          <rule filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1" label="10KM" description="Only show when active in Atlas"/>
+          <rule filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2" label="5KM" description="Only show when active in Atlas"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -6049,40 +6187,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 name="@0@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6105,9 +6243,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>
@@ -6115,22 +6253,22 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -6150,44 +6288,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 name="@0@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6203,32 +6341,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 name="@@0@1@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@0@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -6243,9 +6381,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>
@@ -6255,33 +6393,33 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -6312,39 +6450,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -6364,44 +6502,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 name="@1@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6417,32 +6555,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 name="@@1@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -6457,9 +6595,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>
@@ -6469,22 +6607,22 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -6504,44 +6642,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 name="@1@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6557,32 +6695,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 name="@@1@1@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -6597,9 +6735,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>
@@ -6609,33 +6747,33 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -6666,39 +6804,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 name="2" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -6718,44 +6856,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 name="@2@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6771,32 +6909,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 name="@@2@0@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -6811,9 +6949,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>
@@ -6823,22 +6961,22 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="MarkerLine" enabled="1">
               <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"/>
@@ -6858,44 +6996,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 name="@2@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -6911,32 +7049,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 name="@@2@1@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@2@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -6951,9 +7089,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>
@@ -6963,33 +7101,33 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <layer locked="0" pass="0" class="SimpleLine" enabled="1">
               <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"/>
@@ -7020,9 +7158,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>
@@ -7034,11 +7172,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>
@@ -7047,47 +7185,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -7118,9 +7256,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>
@@ -7128,12 +7266,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -7155,8 +7293,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -7167,26 +7305,26 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="Distance" index="1"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="Distance" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="Distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column width="-1" name="Distance" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7218,17 +7356,17 @@ 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 name="Distance" labelOnTop="0"/>
@@ -7249,7 +7387,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -7322,58 +7460,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -7404,36 +7542,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -7448,44 +7586,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -7508,46 +7646,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="marker" frame_rate="10" alpha="0.796078" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="0.796078">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -7570,15 +7708,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>
@@ -7589,34 +7727,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="8" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidth="0.40000000000000002" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -7631,151 +7769,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="8" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="1" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="1" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="8" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="4" textOpacity="0.90000000000000002" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="227,0,185,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="4" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="227,0,185,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="0.90000000000000002" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.10000000000000001" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeY="0" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0.10000000000000001" shapeRadiiY="0" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -7790,89 +7928,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="1" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="2" minFeatureSize="0" obstacle="0" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="0" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="2" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -7881,145 +8019,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>
@@ -8028,47 +8166,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -8099,9 +8237,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>
@@ -8109,12 +8247,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="10" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="10" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -8129,8 +8267,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -8139,8 +8277,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -8149,8 +8287,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -8162,30 +8300,30 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="type" index="2"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="position" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="position" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8261,7 +8399,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Polygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="Polygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8336,58 +8474,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -8418,36 +8556,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -8462,44 +8600,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -8522,38 +8660,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -8568,9 +8706,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>
@@ -8581,11 +8719,11 @@ 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 value="name" name="dualview/previewExpressions" type="QString"/>
-          <Option value="0" name="embeddedWidgets/count" 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" value="name" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -8594,47 +8732,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -8665,9 +8803,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>
@@ -8675,12 +8813,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="1" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="1" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -8735,38 +8873,38 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="fence_len" index="4"/>
       </aliases>
       <defaults>
-        <default field="name" expression="" applyOnUpdate="0"/>
-        <default field="group" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="cone_len" expression="" applyOnUpdate="0"/>
-        <default field="fence_len" expression="" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="group" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="cone_len" applyOnUpdate="0"/>
+        <default expression="" field="fence_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="group" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="cone_len" desc="" exp=""/>
+        <constraint field="fence_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="name" type="field" hidden="0"/>
-          <column width="-1" name="group" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="cone_len" type="field" hidden="0"/>
-          <column width="-1" name="fence_len" type="field" hidden="0"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8798,8 +8936,8 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
-        <field editable="1" name="group"/>
-        <field editable="1" name="name"/>
+        <field name="group" editable="1"/>
+        <field name="name" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="group" labelOnTop="0"/>
@@ -8811,7 +8949,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8876,7 +9014,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8890,25 +9028,25 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field name="fence_len" comment="" precision="0" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" type="6" subType="0"/>
-        <field name="fence_len" comment="" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" type="6" subType="0"/>
-        <field name="cone_len" comment="" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" type="6" subType="0"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" name="fence_len" precision="0" comment="" subType="0" length="-1" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" precision="0" comment="" subType="0" length="-1" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" name="cone_len" precision="0" comment="" subType="0" length="-1" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyMaxScale="1" styleCategories="AllStyleCategories" simplifyDrawingHints="1" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" version="3.8.3-Zanzibar" minScale="1e+08" simplifyDrawingTol="1" labelsEnabled="1" maxScale="0" readOnly="0">
+          <qgis hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" version="3.8.3-Zanzibar" maxScale="0" minScale="1e+08" simplifyDrawingTol="1" simplifyLocal="1" styleCategories="AllStyleCategories" labelsEnabled="1" simplifyAlgorithm="0">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" enableorderby="0" symbollevels="1" type="RuleRenderer">
+            <renderer-v2 symbollevels="1" type="RuleRenderer" forceraster="0" enableorderby="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Visible"/>
+                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible"/>
               </rules>
               <symbols>
-                <symbol name="0" clip_to_extent="1" type="line" force_rhr="0" alpha="1">
+                <symbol name="0" clip_to_extent="1" force_rhr="0" type="line" alpha="1">
                   <layer locked="0" pass="0" class="SimpleLine" enabled="1">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
@@ -8928,9 +9066,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>
@@ -8941,62 +9079,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule key="{4961744d-6387-45d0-90bf-01e48d575e6e}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
                   <settings>
-                    <text-style previewBkgrdColor="#ffffff" fontLetterSpacing="0" blendMode="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" textOpacity="0.8" fontCapitals="0" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" isExpression="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="comment" fontItalic="0">
-                      <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="255,255,0,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.6" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeJoinStyle="128" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiY="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOpacity="0.6" shapeSizeY="1" shapeRadiiX="1"/>
-                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                    <text-style fontSize="11" previewBkgrdColor="#ffffff" multilineHeight="1" fontCapitals="0" fontStrikeout="0" textColor="0,0,0,255" namedStyle="Regular" blendMode="0" isExpression="0" fontWeight="50" textOpacity="0.8" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" useSubstitutions="0" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+                      <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="0.6" shapeRadiiY="1" shapeOpacity="0.6" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="1" shapeRotation="0" shapeSizeType="0"/>
+                      <shadow shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetUnit="MM" shadowUnder="0" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" plussign="0" decimals="3" useMaxLineLengthForAutoWrap="1" wrapChar="" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement distUnits="MM" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="2" yOffset="0" rotationAngle="0" centroidInside="0" priority="5" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="5" maxCurvedCharAngleIn="25" offsetType="0" maxCurvedCharAngleOut="-25" quadOffset="4" geometryGeneratorType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placement="4" fitInPolygonOnly="0" repeatDistance="0" preserveRotation="1" xOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0"/>
-                    <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" displayAll="1" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="1" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                    <text-format leftDirectionSymbol="&lt;" wrapChar="" reverseDirectionSymbol="0" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                    <placement maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" offsetType="0" geometryGenerator="" fitInPolygonOnly="0" centroidInside="0" quadOffset="4" preserveRotation="1" xOffset="0" repeatDistance="0" repeatDistanceUnits="MM" priority="5" rotationAngle="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="5" placement="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" distUnits="MM" placementFlags="2" centroidWhole="0"/>
+                    <rendering displayAll="1" obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="1" drawLabels="1" obstacleFactor="1" minFeatureSize="0" labelPerPart="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 key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}" filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')">
                   <settings>
-                    <text-style previewBkgrdColor="#ffffff" fontLetterSpacing="0" blendMode="0" multilineHeight="1" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontCapitals="0" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="round( $length, 1) || 'm'" fontItalic="0">
-                      <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferOpacity="1" bufferSize="1" bufferColor="255,255,255,255" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                      <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeJoinStyle="64" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiUnit="MM" shapeRadiiY="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0"/>
-                      <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowScale="100" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowOffsetDist="1"/>
+                    <text-style fontSize="12" previewBkgrdColor="#ffffff" multilineHeight="1" fontCapitals="0" fontStrikeout="0" textColor="0,0,0,255" namedStyle="Semibold" blendMode="0" isExpression="1" fontWeight="63" textOpacity="1" fieldName="round( $length, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" useSubstitutions="0" fontLetterSpacing="0" fontFamily="Myriad Pro" fontItalic="0">
+                      <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+                      <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRotationType="0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0"/>
+                      <shadow shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowDraw="0" shadowOffsetUnit="MM" shadowUnder="0" shadowOpacity="0.7" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" plussign="0" decimals="3" useMaxLineLengthForAutoWrap="1" wrapChar="" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                    <placement distUnits="MM" geometryGenerator="" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" placementFlags="15" yOffset="0" rotationAngle="0" centroidInside="0" priority="5" geometryGeneratorEnabled="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" dist="1" maxCurvedCharAngleIn="25" offsetType="0" maxCurvedCharAngleOut="-25" quadOffset="4" geometryGeneratorType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" placement="2" fitInPolygonOnly="0" repeatDistance="0" preserveRotation="1" xOffset="0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0"/>
-                    <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" displayAll="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                    <text-format leftDirectionSymbol="&lt;" wrapChar="" reverseDirectionSymbol="0" plussign="0" multilineAlign="4294967295" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                    <placement maxCurvedCharAngleIn="25" maxCurvedCharAngleOut="-25" offsetType="0" geometryGenerator="" fitInPolygonOnly="0" centroidInside="0" quadOffset="4" preserveRotation="1" xOffset="0" repeatDistance="0" repeatDistanceUnits="MM" priority="5" rotationAngle="0" geometryGeneratorType="PointGeometry" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" yOffset="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" dist="1" placement="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" distUnits="MM" placementFlags="15" centroidWhole="0"/>
+                    <rendering displayAll="0" obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" labelPerPart="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>
@@ -9004,8 +9142,8 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
@@ -9013,17 +9151,17 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory penColor="#000000" enabled="0" sizeType="MM" barWidth="5" scaleDependency="Area" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" lineSizeType="MM" backgroundAlpha="255" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" backgroundColor="#ffffff" minScaleDenominator="0" height="15">
-                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute field="" label="" color="#000000"/>
+              <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" lineSizeScale="3x:0,0,0,0,0,0" rotationOffset="270" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+            <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <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>
@@ -9126,66 +9264,66 @@ def my_form_open(dialog, layer, feature):
             <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 expression="" field="id" applyOnUpdate="0"/>
+              <default expression="" field="group" applyOnUpdate="0"/>
+              <default expression="" field="comment" applyOnUpdate="0"/>
+              <default expression="" field="moveable" applyOnUpdate="0"/>
+              <default expression="" field="type" applyOnUpdate="0"/>
+              <default expression="" field="name" applyOnUpdate="0"/>
+              <default expression="" field="hidden" applyOnUpdate="0"/>
+              <default expression="" field="auxiliary_storage_labeling_positiony" applyOnUpdate="0"/>
+              <default expression="" field="auxiliary_storage_labeling_positionx" applyOnUpdate="0"/>
+              <default expression="" field="fence_len" applyOnUpdate="0"/>
+              <default expression="" field="cone_len" applyOnUpdate="0"/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="comment" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="moveable" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="hidden" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positiony" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="auxiliary_storage_labeling_positionx" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
-              <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="auxiliary_storage_labeling_positiony" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="auxiliary_storage_labeling_positionx" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+              <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
             </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 field="id" desc="" exp=""/>
+              <constraint field="group" desc="" exp=""/>
+              <constraint field="comment" desc="" exp=""/>
+              <constraint field="moveable" desc="" exp=""/>
+              <constraint field="type" desc="" exp=""/>
+              <constraint field="name" desc="" exp=""/>
+              <constraint field="hidden" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positiony" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positionx" desc="" exp=""/>
+              <constraint field="fence_len" desc="" exp=""/>
+              <constraint field="cone_len" desc="" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field name="fence_len" comment="" precision="0" length="-1" typeName="double precision" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" type="6" subType="0"/>
-              <field name="fence_len" comment="" precision="0" length="-1" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" type="6" subType="0"/>
-              <field name="cone_len" comment="" precision="0" length="-1" typeName="double precision" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" type="6" subType="0"/>
+              <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" name="fence_len" precision="0" subType="0" comment="" length="-1" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" precision="0" subType="0" comment="" length="-1" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" name="cone_len" precision="0" subType="0" comment="" length="-1" type="6"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
             </attributeactions>
             <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
               <columns>
-                <column width="-1" name="id" type="field" hidden="0"/>
-                <column width="-1" name="group" type="field" hidden="0"/>
-                <column width="-1" type="actions" hidden="1"/>
-                <column width="223" name="comment" type="field" hidden="0"/>
-                <column width="-1" name="moveable" type="field" hidden="0"/>
-                <column width="-1" name="type" type="field" hidden="0"/>
-                <column width="414" name="name" type="field" hidden="0"/>
-                <column width="-1" name="hidden" type="field" hidden="0"/>
-                <column width="-1" name="fence_len" type="field" hidden="0"/>
-                <column width="-1" name="cone_len" type="field" hidden="0"/>
-                <column width="-1" name="auxiliary_storage_labeling_positiony" type="field" hidden="1"/>
-                <column width="-1" name="auxiliary_storage_labeling_positionx" type="field" hidden="1"/>
+                <column width="-1" name="id" hidden="0" type="field"/>
+                <column width="-1" name="group" hidden="0" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" name="comment" hidden="0" type="field"/>
+                <column width="-1" name="moveable" hidden="0" type="field"/>
+                <column width="-1" name="type" hidden="0" type="field"/>
+                <column width="414" name="name" hidden="0" type="field"/>
+                <column width="-1" name="hidden" hidden="0" type="field"/>
+                <column width="-1" name="fence_len" hidden="0" type="field"/>
+                <column width="-1" name="cone_len" hidden="0" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positiony" hidden="1" type="field"/>
+                <column width="-1" name="auxiliary_storage_labeling_positionx" hidden="1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -9216,18 +9354,18 @@ 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 name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
@@ -9258,58 +9396,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9340,36 +9478,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -9384,44 +9522,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9444,64 +9582,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 forceraster="0" enableorderby="0" symbollevels="1" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="1" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" label="Show in fencing maps">
-            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" filter="regexp_match(&quot;type&quot;, '^cone')" label="Cones"/>
-            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" label="Moveable fences"/>
-            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" label="Fixed fences"/>
-            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" filter="regexp_match(&quot;type&quot;, '^constr')" label="Construction" checkstate="0"/>
+          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)')" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
+            <rule filter="regexp_match(&quot;type&quot;, '^cone')" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0" label="Cones"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1'" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1" label="Moveable fences"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1'" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2" label="Fixed fences"/>
+            <rule checkstate="0" filter="regexp_match(&quot;type&quot;, '^constr')" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3" label="Construction"/>
           </rule>
-          <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" label="Is Visible" checkstate="0"/>
+          <rule checkstate="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" symbol="4" label="Is Visible"/>
           <rule key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9532,56 +9670,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9612,56 +9750,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 name="2" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9692,56 +9830,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 name="3" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9772,56 +9910,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 name="4" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9852,50 +9990,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 name="5" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -9926,9 +10064,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>
@@ -9937,34 +10075,34 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{75ef682c-4a85-4fe1-962a-6082490a3c19}">
-          <rule key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{05a5f0dd-6b57-4866-8227-d1dd0f4dfdf5}">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" textOpacity="0.80000000000000004" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="comment" fontItalic="0">
+              <text-style fontSize="11" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Regular" blendMode="0" isExpression="0" allowHtml="0" fontWeight="50" textOpacity="0.80000000000000004" forcedItalic="0" forcedBold="0" fieldName="comment" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="255,255,0,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.59999999999999998" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeSizeY="1" shapeRadiiX="1">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="0.59999999999999998" shapeRadiiY="1" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="255,255,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="1" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -9979,110 +10117,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"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="5" lineAnchorTextPoint="CenterOfText" priority="5" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="14" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="2" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1.8200000000000001" mergeLines="1" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="2" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="5" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="14" polygonPlacementFlags="2" priority="5" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="1" drawLabels="1" obstacleFactor="1.8200000000000001" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{226e1338-ed15-4fc8-a035-fefee03c38d6}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{226e1338-ed15-4fc8-a035-fefee03c38d6}">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="11" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="round( $length, 1) || 'm'" fontItalic="0">
+              <text-style fontSize="11" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="round( $length, 1) || 'm'" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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 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"/>
@@ -10097,88 +10235,88 @@ 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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="4294967295" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="1" lineAnchorTextPoint="CenterOfText" priority="6" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="14" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="2" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="2" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="14" polygonPlacementFlags="2" priority="6" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -10187,11 +10325,11 @@ 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="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>
@@ -10200,47 +10338,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -10271,9 +10409,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>
@@ -10281,12 +10419,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -10373,58 +10511,58 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="cone_len" index="8"/>
       </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="fence_len" expression="" applyOnUpdate="0"/>
-        <default field="cone_len" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="group" applyOnUpdate="0"/>
+        <default expression="" field="comment" applyOnUpdate="0"/>
+        <default expression="" field="moveable" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="hidden" applyOnUpdate="0"/>
+        <default expression="" field="fence_len" applyOnUpdate="0"/>
+        <default expression="" field="cone_len" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="group" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="comment" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="moveable" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="hidden" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="fence_len" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="cone_len" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="group" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="comment" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="moveable" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="hidden" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="fence_len" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="cone_len" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="group" desc="" exp=""/>
+        <constraint field="comment" desc="" exp=""/>
+        <constraint field="moveable" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="hidden" desc="" exp=""/>
+        <constraint field="fence_len" desc="" exp=""/>
+        <constraint field="cone_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field name="fence_len" comment="" precision="0" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" type="6" subType="0"/>
-        <field name="fence_len" comment="" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" type="6" subType="0"/>
-        <field name="cone_len" comment="" precision="0" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" type="6" subType="0"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" typeName="double precision" name="fence_len" precision="0" comment="" subType="0" length="-1" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" typeName="double precision" name="fence_len" precision="0" comment="" subType="0" length="-1" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" typeName="double precision" name="cone_len" precision="0" comment="" subType="0" length="-1" type="6"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="group" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="373" name="comment" type="field" hidden="0"/>
-          <column width="-1" name="moveable" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="692" name="name" type="field" hidden="0"/>
-          <column width="-1" name="hidden" type="field" hidden="0"/>
-          <column width="-1" name="fence_len" type="field" hidden="0"/>
-          <column width="-1" name="cone_len" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="group" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="373" name="comment" hidden="0" type="field"/>
+          <column width="-1" name="moveable" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="692" name="name" hidden="0" type="field"/>
+          <column width="-1" name="hidden" hidden="0" type="field"/>
+          <column width="-1" name="fence_len" hidden="0" type="field"/>
+          <column width="-1" name="cone_len" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10456,18 +10594,18 @@ 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 name="auxiliary_storage_labeling_positionx" labelOnTop="0"/>
@@ -10489,7 +10627,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10562,58 +10700,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -10644,36 +10782,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -10688,44 +10826,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -10748,54 +10886,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -10826,9 +10964,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>
@@ -10839,11 +10977,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>
@@ -10852,47 +10990,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -10923,9 +11061,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>
@@ -10933,12 +11071,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -10961,22 +11099,22 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="id" index="0"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11008,7 +11146,7 @@ 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 name="id" labelOnTop="0"/>
@@ -11019,17 +11157,17 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiPolygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.94678832168284544</ymin>
-        <xmax>18.42124635930919041</xmax>
+        <ymin>-33.95934132149262297</ymin>
+        <xmax>18.42432608246585701</xmax>
         <ymax>-33.8965939968351222</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
-        <ymin>-33.94678832168284544</ymin>
-        <xmax>18.42124635930919041</xmax>
+        <ymin>-33.95934132149262297</ymin>
+        <xmax>18.42432608246585701</xmax>
         <ymax>-33.8965939968351222</ymax>
       </wgs84extent>
       <id>marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51</id>
@@ -11092,58 +11230,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -11174,36 +11312,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -11218,44 +11356,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -11278,38 +11416,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -11324,9 +11462,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>
@@ -11337,11 +11475,15 @@ 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;id&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" 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>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -11350,47 +11492,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -11421,9 +11563,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>
@@ -11431,18 +11573,18 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <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>
@@ -11457,8 +11599,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -11467,8 +11609,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -11477,43 +11619,55 @@ def my_form_open(dialog, layer, feature):
           <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 name="day" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
       </fieldConfiguration>
       <aliases>
         <alias name="" field="id" index="0"/>
         <alias name="" field="type" index="1"/>
         <alias name="" field="page" index="2"/>
+        <alias name="" field="day" index="3"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
-        <default field="page" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="page" applyOnUpdate="0"/>
+        <default expression="" field="day" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="page" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="page" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="day" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="page" type="field" hidden="0"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="day" hidden="0" type="field"/>
+          <column width="-1" name="page" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11545,9 +11699,9 @@ 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 name="id" labelOnTop="0"/>
@@ -11560,7 +11714,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.94592961896692884</ymin>
@@ -11625,7 +11779,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11636,12 +11790,13 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join editable="0" memoryCache="1" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" upsertOnEdit="0" joinFieldName="position" customPrefix="csv_" hasCustomPrefix="1" cascadedDelete="0" dynamicForm="0">
+        <join memoryCache="0" joinFieldName="position" dynamicForm="0" cascadedDelete="0" targetFieldName="position" editable="0" customPrefix="csv_" hasCustomPrefix="1" upsertOnEdit="0" joinLayerId="marshals_by_position20161003112326575">
           <joinFieldsSubset>
+            <field name="position"/>
             <field name="club"/>
-            <field name="name"/>
-            <field name="captain"/>
-            <field name="captain_phone"/>
+            <field name="firstname"/>
+            <field name="surname"/>
+            <field name="days"/>
             <field name="first_runner"/>
             <field name="last_runner"/>
             <field name="instructions"/>
@@ -11662,58 +11817,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="id" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -11744,36 +11899,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -11788,44 +11943,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -11848,54 +12003,55 @@ 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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" description="Show in marshal overview" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" label="Show in marshal overview"/>
-          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" description="Show in marshal overview" symbol="1" filter="'marshal' = attribute( @atlas_feature , 'type' )" label="Show in marshal maps"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" symbol="0" label="Always show in marshal overview" description="Show in marshal overview"/>
+          <rule checkstate="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="1" label="Show in marshal overview" description="Show in marshal overview"/>
+          <rule checkstate="0" filter="'marshal' = attribute( @atlas_feature , 'type' ) 'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;csv_days&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="2" label="Show in marshal maps" description="Show in marshal overview"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="marker" frame_rate="10" alpha="0.792157" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="0.792157">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option 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">
               <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="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,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"/>
-              <prop v="0,0,0,255" k="color"/>
+              <prop v="255,255,255,255" k="color"/>
               <prop v="1" k="horizontal_anchor_point"/>
               <prop v="bevel" k="joinstyle"/>
               <prop v="circle" k="name"/>
@@ -11904,52 +12060,110 @@ def my_form_open(dialog, layer, feature):
               <prop v="MM" k="offset_unit"/>
               <prop v="0,0,0,255" k="outline_color"/>
               <prop v="solid" k="outline_style"/>
-              <prop v="0" k="outline_width"/>
+              <prop v="0.2" k="outline_width"/>
               <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
               <prop v="MM" k="outline_width_unit"/>
               <prop v="diameter" k="scale_method"/>
-              <prop v="1" k="size"/>
+              <prop v="5" k="size"/>
               <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
-              <prop v="MM" k="size_unit"/>
+              <prop v="Pixel" k="size_unit"/>
               <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 name="1" clip_to_extent="1" type="marker" frame_rate="10" alpha="0.01" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="0.792157">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option 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">
               <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="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"/>
+              <prop v="255,255,255,255" k="color"/>
+              <prop v="1" k="horizontal_anchor_point"/>
+              <prop v="bevel" k="joinstyle"/>
+              <prop v="circle" k="name"/>
+              <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="0,0,0,255" k="outline_color"/>
+              <prop v="solid" k="outline_style"/>
+              <prop v="0.2" k="outline_width"/>
+              <prop v="3x:0,0,0,0,0,0" k="outline_width_map_unit_scale"/>
+              <prop v="MM" k="outline_width_unit"/>
+              <prop v="diameter" k="scale_method"/>
+              <prop v="5" k="size"/>
+              <prop v="3x:0,0,0,0,0,0" k="size_map_unit_scale"/>
+              <prop v="Pixel" k="size_unit"/>
+              <prop v="1" k="vertical_anchor_point"/>
+              <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>
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="0.01">
+            <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 locked="0" pass="1" class="SimpleMarker" enabled="1">
+              <Option type="Map">
+                <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"/>
@@ -11972,9 +12186,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>
@@ -11982,35 +12196,35 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{3100b6d3-183a-45b5-94f5-2ae25cc59226}">
-          <rule key="{26c6b0ec-ed26-401f-abd2-72394fe7d58d}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="'marshal plan' = attribute( @atlas_feature , 'type' )">
+        <rules key="{782e8913-173c-49d0-a55a-d546e6ab18ac}">
+          <rule active="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{27576711-5c81-4f5e-b709-39937077f10b}" description="Show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" textOpacity="0.90000000000000002" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="6" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="0.90000000000000002" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.10000000000000001" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeY="0" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0.10000000000000001" shapeRadiiY="0" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -12025,121 +12239,121 @@ 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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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="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>
                 <substitutions/>
               </text-style>
-              <text-format multilineAlign="0" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="1" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="2" minFeatureSize="0" obstacle="0" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="1" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="0" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="2" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{98b8f830-3256-405e-9a42-27279b9826d4}" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{4a6c81c3-8777-4e43-8e37-1529c8f0e84e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" textOpacity="0.5" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="6" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="0.5" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.5" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidth="0.40000000000000002" shapeRadiiY="0" shapeOpacity="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -12154,181 +12368,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="8" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="5" minFeatureSize="0" obstacle="0" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1.8" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="1" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="8" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="0" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="5" mergeLines="0" drawLabels="1" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{99221fb4-413e-4f4d-b076-d6c2768a862d}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id" key="{56b5884e-da69-4fbd-bdc6-c77f1ac895e4}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="6" textOpacity="0.59999999999999998" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="6" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Regular" blendMode="0" isExpression="0" allowHtml="0" fontWeight="50" textOpacity="0.59999999999999998" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidth="0.40000000000000002" shapeRadiiY="0" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -12343,181 +12557,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="8" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="5" minFeatureSize="0" obstacle="0" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1.8" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="1" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="8" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="0" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="5" mergeLines="0" drawLabels="1" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{85065de1-e51c-4c04-9292-536cbccc7aba}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{1e6946de-3bec-4a18-b88c-f6b89100ed3e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" textOpacity="0.90000000000000002" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="position" fontItalic="0">
+              <text-style fontSize="8" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="0.90000000000000002" forcedItalic="0" forcedBold="0" fieldName="position" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeFillColor="255,255,0,255" shapeSVGFile="" shapeBorderWidth="0.40000000000000002" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.90000000000000002" shapeSizeY="0.20000000000000001" shapeRadiiX="0">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="3" shapeSizeX="0.20000000000000001" shapeBorderWidthUnit="MM" shapeBorderWidth="0.40000000000000002" shapeRadiiY="0" shapeOpacity="0.90000000000000002" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="255,255,0,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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,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"/>
@@ -12532,149 +12746,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="0" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="10" minFeatureSize="0" obstacle="0" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="1.8" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="1" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="0" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="10" mergeLines="0" drawLabels="1" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -12683,151 +12897,153 @@ 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="dualview/previewExpressions" type="StringList">
+          <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 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>
@@ -12836,47 +13052,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -12907,9 +13123,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>
@@ -12917,12 +13133,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -12937,8 +13153,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -12947,8 +13163,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -12957,8 +13173,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -12967,8 +13183,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -12977,46 +13193,50 @@ def my_form_open(dialog, layer, feature):
           <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 name="csv_position" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <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 name="csv_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>
-            </config>
-          </editWidget>
-        </field>
-        <field name="csv_captain" configurationFlags="None">
+        <field name="csv_firstname" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field name="csv_captain_phone" configurationFlags="None">
+        <field name="csv_surname" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
+        <field name="csv_days" configurationFlags="None">
+          <editWidget type="Range">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="csv_first_runner" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
@@ -13045,75 +13265,80 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="type" index="2"/>
         <alias name="" field="notes" index="3"/>
         <alias name="" field="xyposition" index="4"/>
-        <alias name="" field="csv_club" index="5"/>
-        <alias name="" field="csv_name" index="6"/>
-        <alias name="" field="csv_captain" index="7"/>
-        <alias name="" field="csv_captain_phone" index="8"/>
-        <alias name="" field="csv_first_runner" index="9"/>
-        <alias name="" field="csv_last_runner" index="10"/>
-        <alias name="" field="csv_instructions" index="11"/>
+        <alias name="" field="csv_position" index="5"/>
+        <alias name="" field="csv_club" index="6"/>
+        <alias name="" field="csv_firstname" index="7"/>
+        <alias name="" field="csv_surname" index="8"/>
+        <alias name="" field="csv_days" index="9"/>
+        <alias name="" field="csv_first_runner" index="10"/>
+        <alias name="" field="csv_last_runner" index="11"/>
+        <alias name="" field="csv_instructions" index="12"/>
       </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="csv_club" expression="" applyOnUpdate="0"/>
-        <default field="csv_name" expression="" applyOnUpdate="0"/>
-        <default field="csv_captain" expression="" applyOnUpdate="0"/>
-        <default field="csv_captain_phone" expression="" applyOnUpdate="0"/>
-        <default field="csv_first_runner" expression="" applyOnUpdate="0"/>
-        <default field="csv_last_runner" expression="" applyOnUpdate="0"/>
-        <default field="csv_instructions" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="notes" applyOnUpdate="0"/>
+        <default expression="" field="xyposition" applyOnUpdate="0"/>
+        <default expression="" field="csv_position" applyOnUpdate="0"/>
+        <default expression="" field="csv_club" applyOnUpdate="0"/>
+        <default expression="" field="csv_firstname" applyOnUpdate="0"/>
+        <default expression="" field="csv_surname" applyOnUpdate="0"/>
+        <default expression="" field="csv_days" applyOnUpdate="0"/>
+        <default expression="" field="csv_first_runner" applyOnUpdate="0"/>
+        <default expression="" field="csv_last_runner" applyOnUpdate="0"/>
+        <default expression="" field="csv_instructions" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="notes" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="xyposition" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_club" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_captain" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_captain_phone" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_first_runner" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_last_runner" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="csv_instructions" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="notes" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="xyposition" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_club" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_firstname" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_surname" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_days" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_first_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="csv_instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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="csv_club" exp="" desc=""/>
-        <constraint field="csv_name" exp="" desc=""/>
-        <constraint field="csv_captain" exp="" desc=""/>
-        <constraint field="csv_captain_phone" exp="" desc=""/>
-        <constraint field="csv_first_runner" exp="" desc=""/>
-        <constraint field="csv_last_runner" exp="" desc=""/>
-        <constraint field="csv_instructions" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="notes" desc="" exp=""/>
+        <constraint field="xyposition" desc="" exp=""/>
+        <constraint field="csv_position" desc="" exp=""/>
+        <constraint field="csv_club" desc="" exp=""/>
+        <constraint field="csv_firstname" desc="" exp=""/>
+        <constraint field="csv_surname" desc="" exp=""/>
+        <constraint field="csv_days" desc="" exp=""/>
+        <constraint field="csv_first_runner" desc="" exp=""/>
+        <constraint field="csv_last_runner" desc="" exp=""/>
+        <constraint field="csv_instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="position" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="notes" type="field" hidden="0"/>
-          <column width="-1" name="xyposition" type="field" hidden="0"/>
-          <column width="-1" name="csv_name" type="field" hidden="0"/>
-          <column width="-1" name="csv_club" type="field" hidden="0"/>
-          <column width="-1" name="csv_captain" type="field" hidden="0"/>
-          <column width="-1" name="csv_captain_phone" type="field" hidden="0"/>
-          <column width="-1" name="csv_first_runner" type="field" hidden="0"/>
-          <column width="-1" name="csv_last_runner" type="field" hidden="0"/>
-          <column width="-1" name="csv_instructions" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="notes" hidden="0" type="field"/>
+          <column width="-1" name="xyposition" hidden="0" type="field"/>
+          <column width="-1" name="csv_club" hidden="0" type="field"/>
+          <column width="-1" name="csv_first_runner" hidden="0" type="field"/>
+          <column width="-1" name="csv_last_runner" hidden="0" type="field"/>
+          <column width="-1" name="csv_firstname" hidden="0" type="field"/>
+          <column width="-1" name="csv_surname" hidden="0" type="field"/>
+          <column width="-1" name="csv_position" hidden="0" type="field"/>
+          <column width="-1" name="csv_days" hidden="0" type="field"/>
+          <column width="-1" name="csv_instructions" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13145,37 +13370,39 @@ 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_number"/>
-        <field editable="0" name="csv_captain_phone"/>
-        <field editable="0" name="csv_club"/>
-        <field editable="0" name="csv_email"/>
-        <field editable="0" name="csv_first runner"/>
-        <field editable="1" name="csv_first_"/>
-        <field editable="0" name="csv_first_runner"/>
-        <field editable="0" name="csv_firstname"/>
-        <field editable="1" name="csv_instru"/>
-        <field editable="0" name="csv_instructions"/>
-        <field editable="0" name="csv_last runner"/>
-        <field editable="1" name="csv_last_r"/>
-        <field editable="0" name="csv_last_runner"/>
-        <field editable="0" name="csv_name"/>
-        <field editable="0" name="csv_phone"/>
-        <field editable="1" name="csv_positi"/>
-        <field editable="0" name="csv_position"/>
-        <field editable="0" name="csv_races"/>
-        <field editable="0" name="csv_surname"/>
-        <field editable="1" name="id"/>
-        <field editable="1" name="notes"/>
-        <field editable="1" name="oldpositio"/>
-        <field editable="1" name="position"/>
-        <field editable="1" name="type"/>
-        <field editable="1" name="xyposition"/>
+        <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="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 name="csv_10_distance" labelOnTop="0"/>
@@ -13184,9 +13411,11 @@ def my_form_open(dialog, layer, feature):
         <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"/>
@@ -13210,7 +13439,28 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
         <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
-      <reuseLastValue/>
+      <reuseLastValue>
+        <field reuseLastValue="0" name="csv_captain"/>
+        <field reuseLastValue="0" name="csv_captain_email"/>
+        <field reuseLastValue="0" name="csv_captain_phone"/>
+        <field reuseLastValue="0" name="csv_club"/>
+        <field reuseLastValue="0" name="csv_days"/>
+        <field reuseLastValue="0" name="csv_email"/>
+        <field reuseLastValue="0" name="csv_first_runner"/>
+        <field reuseLastValue="0" name="csv_firstname"/>
+        <field reuseLastValue="0" name="csv_instructions"/>
+        <field reuseLastValue="0" name="csv_last_runner"/>
+        <field reuseLastValue="0" name="csv_name"/>
+        <field reuseLastValue="0" name="csv_phone"/>
+        <field reuseLastValue="0" name="csv_position"/>
+        <field reuseLastValue="0" name="csv_races"/>
+        <field reuseLastValue="0" name="csv_surname"/>
+        <field reuseLastValue="0" name="id"/>
+        <field reuseLastValue="0" name="notes"/>
+        <field reuseLastValue="0" name="position"/>
+        <field reuseLastValue="0" name="type"/>
+        <field reuseLastValue="0" name="xyposition"/>
+      </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
         <widget name="csv_captain_ph">
@@ -13259,7 +13509,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer styleCategories="AllStyleCategories" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" geometry="No geometry" legendPlaceholderImage="" autoRefreshTime="0" autoRefreshEnabled="0" type="vector" maxScale="100000" readOnly="0" refreshOnNotifyEnabled="0" wkbType="NoGeometry">
+    <maplayer hasScaleBasedVisibilityFlag="0" readOnly="0" autoRefreshEnabled="0" maxScale="100000" minScale="1e+08" autoRefreshTime="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0" styleCategories="AllStyleCategories" geometry="No geometry" type="vector" legendPlaceholderImage="" wkbType="NoGeometry">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -13312,7 +13562,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13325,8 +13575,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="marshal_positions20160930121322287"/>
         <layer id="all_routes20170907054841602"/>
+        <layer id="marshal_positions20160930121322287"/>
       </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
@@ -13340,58 +13590,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -13422,36 +13672,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -13466,44 +13716,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -13526,9 +13776,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>
@@ -13537,11 +13787,11 @@ 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>
@@ -13557,8 +13807,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13567,8 +13817,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13591,8 +13841,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13601,8 +13851,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13611,8 +13861,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13621,8 +13871,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -13641,12 +13891,19 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
+        <field name="days" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <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>
@@ -13684,80 +13941,84 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="captain" index="7"/>
         <alias name="" field="captain_phone" index="8"/>
         <alias name="" field="captain_email" index="9"/>
-        <alias name="" field="races" index="10"/>
-        <alias name="" field="first_runner" index="11"/>
-        <alias name="" field="last_runner" index="12"/>
-        <alias name="" field="instructions" index="13"/>
+        <alias name="" field="days" index="10"/>
+        <alias name="" field="races" index="11"/>
+        <alias name="" field="first_runner" index="12"/>
+        <alias name="" field="last_runner" index="13"/>
+        <alias name="" field="instructions" index="14"/>
       </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="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 expression="" field="position" applyOnUpdate="0"/>
+        <default expression="" field="club" applyOnUpdate="0"/>
+        <default expression="" field="firstname" applyOnUpdate="0"/>
+        <default expression="" field="surname" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="phone" applyOnUpdate="0"/>
+        <default expression="" field="email" applyOnUpdate="0"/>
+        <default expression="" field="captain" applyOnUpdate="0"/>
+        <default expression="" field="captain_phone" applyOnUpdate="0"/>
+        <default expression="" field="captain_email" applyOnUpdate="0"/>
+        <default expression="" field="days" applyOnUpdate="0"/>
+        <default expression="" field="races" applyOnUpdate="0"/>
+        <default expression="" field="first_runner" applyOnUpdate="0"/>
+        <default expression="" field="last_runner" applyOnUpdate="0"/>
+        <default expression="" field="instructions" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="position" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="club" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="firstname" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="surname" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="phone" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="email" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="captain" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="captain_phone" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="captain_email" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="races" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="first_runner" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="last_runner" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="instructions" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="position" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="club" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="firstname" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="surname" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="phone" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="email" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="captain" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="captain_phone" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="captain_email" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="days" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="races" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="first_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="last_runner" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="instructions" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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="races" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="club" desc="" exp=""/>
+        <constraint field="firstname" desc="" exp=""/>
+        <constraint field="surname" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="phone" desc="" exp=""/>
+        <constraint field="email" desc="" exp=""/>
+        <constraint field="captain" desc="" exp=""/>
+        <constraint field="captain_phone" desc="" exp=""/>
+        <constraint field="captain_email" desc="" exp=""/>
+        <constraint field="days" desc="" exp=""/>
+        <constraint field="races" desc="" exp=""/>
+        <constraint field="first_runner" desc="" exp=""/>
+        <constraint field="last_runner" desc="" exp=""/>
+        <constraint field="instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="position" type="field" hidden="0"/>
-          <column width="221" name="name" type="field" hidden="0"/>
-          <column width="-1" name="club" type="field" hidden="0"/>
-          <column width="-1" name="phone" type="field" hidden="0"/>
-          <column width="-1" name="email" type="field" hidden="0"/>
-          <column width="-1" name="captain" type="field" hidden="0"/>
-          <column width="-1" name="races" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="first_runner" type="field" hidden="0"/>
-          <column width="-1" name="last_runner" type="field" hidden="0"/>
-          <column width="-1" name="instructions" type="field" hidden="0"/>
-          <column width="-1" name="firstname" type="field" hidden="0"/>
-          <column width="-1" name="surname" type="field" hidden="0"/>
-          <column width="-1" name="captain_phone" type="field" hidden="0"/>
-          <column width="-1" name="captain_email" type="field" hidden="0"/>
+          <column width="-1" name="position" hidden="0" type="field"/>
+          <column width="221" name="name" hidden="0" type="field"/>
+          <column width="-1" name="club" hidden="0" type="field"/>
+          <column width="-1" name="phone" hidden="0" type="field"/>
+          <column width="-1" name="email" hidden="0" type="field"/>
+          <column width="-1" name="captain" hidden="0" type="field"/>
+          <column width="-1" name="races" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="first_runner" hidden="0" type="field"/>
+          <column width="-1" name="last_runner" hidden="0" type="field"/>
+          <column width="-1" name="instructions" hidden="0" type="field"/>
+          <column width="-1" name="firstname" hidden="0" type="field"/>
+          <column width="-1" name="surname" hidden="0" type="field"/>
+          <column width="-1" name="captain_phone" hidden="0" type="field"/>
+          <column width="-1" name="captain_email" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13789,23 +14050,23 @@ 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 name="10_distance" labelOnTop="0"/>
@@ -13832,7 +14093,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13897,7 +14158,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13922,58 +14183,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14004,36 +14265,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -14048,44 +14309,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14108,58 +14369,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" filter="&quot;type&quot; IS 'car'" label="Car"/>
-          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14190,50 +14451,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14264,30 +14525,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">
               <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"/>
@@ -14307,33 +14568,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 name="@1@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -14349,32 +14610,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 name="@@1@1@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -14389,9 +14650,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>
@@ -14404,11 +14665,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>
@@ -14417,47 +14678,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -14488,9 +14749,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>
@@ -14498,12 +14759,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -14534,26 +14795,26 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="type" index="1"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14585,8 +14846,8 @@ 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 name="id" labelOnTop="0"/>
@@ -14598,7 +14859,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14663,7 +14924,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14688,58 +14949,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14770,36 +15031,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -14814,44 +15075,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -14874,44 +15135,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 symbollevels="0" referencescale="-1" type="nullSymbol" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8.5" textOpacity="0.75" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="name" fontItalic="0">
+          <text-style fontSize="8.5" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Regular" blendMode="0" isExpression="0" allowHtml="0" fontWeight="50" textOpacity="0.75" forcedItalic="0" forcedBold="0" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1.5" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1.5" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -14926,109 +15187,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="1" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="2" centroidWhole="0" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="0.20000000000000001" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="4" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="2" polygonPlacementFlags="2" priority="1" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="0.20000000000000001" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -15037,47 +15298,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -15108,9 +15369,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>
@@ -15118,12 +15379,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -15138,8 +15399,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15148,8 +15409,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15158,8 +15419,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15168,8 +15429,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15178,8 +15439,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15188,8 +15449,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15198,8 +15459,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15208,8 +15469,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15218,8 +15479,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15237,54 +15498,54 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="label_rota" index="8"/>
       </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 expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="osm_id" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="z_order" applyOnUpdate="0"/>
+        <default expression="" field="population" applyOnUpdate="0"/>
+        <default expression="" field="label_x" applyOnUpdate="0"/>
+        <default expression="" field="label_y" applyOnUpdate="0"/>
+        <default expression="" field="label_rota" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="osm_id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="z_order" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="population" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_x" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_y" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_rota" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="population" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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 field="id" desc="" exp=""/>
+        <constraint field="osm_id" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="z_order" desc="" exp=""/>
+        <constraint field="population" desc="" exp=""/>
+        <constraint field="label_x" desc="" exp=""/>
+        <constraint field="label_y" desc="" exp=""/>
+        <constraint field="label_rota" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="osm_id" type="field" hidden="0"/>
-          <column width="-1" name="name" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="z_order" type="field" hidden="0"/>
-          <column width="-1" name="population" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="label_x" type="field" hidden="0"/>
-          <column width="-1" name="label_y" type="field" hidden="0"/>
-          <column width="-1" name="label_rota" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" name="population" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15316,15 +15577,15 @@ 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 name="id" labelOnTop="0"/>
@@ -15343,7 +15604,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -15408,7 +15669,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15433,58 +15694,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -15515,36 +15776,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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,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"/>
@@ -15559,44 +15820,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -15619,52 +15880,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 symbollevels="0" referencescale="-1" type="nullSymbol" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="7" textOpacity="0.80000000000000004" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontItalic="0">
+          <text-style fontSize="7" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Regular" blendMode="0" isExpression="1" allowHtml="0" fontWeight="50" textOpacity="0.80000000000000004" forcedItalic="0" forcedBold="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="markerSymbol" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="markerSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -15687,34 +15948,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 name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -15729,114 +15990,116 @@ 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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="3" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MapUnit" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="4" centroidWhole="0" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="3" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="LineGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="5" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="0.29999999999999999" mergeLines="1" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="0" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="LineGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="4" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="3" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MapUnit" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="4" polygonPlacementFlags="2" priority="3" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="1" drawLabels="1" obstacleFactor="0.29999999999999999" minFeatureSize="5" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option 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>
@@ -15845,47 +16108,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -15916,9 +16179,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>
@@ -15926,12 +16189,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -15946,8 +16209,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -15956,8 +16219,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -16001,8 +16264,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -16083,82 +16346,82 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="auxiliary_storage_labeling_show" index="15"/>
       </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 expression="" field="osm_id" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="highway" applyOnUpdate="0"/>
+        <default expression="" field="waterway" applyOnUpdate="0"/>
+        <default expression="" field="aerialway" applyOnUpdate="0"/>
+        <default expression="" field="barrier" applyOnUpdate="0"/>
+        <default expression="" field="man_made" applyOnUpdate="0"/>
+        <default expression="" field="z_order" applyOnUpdate="0"/>
+        <default expression="" field="other_tags" applyOnUpdate="0"/>
+        <default expression="" field="never_show" applyOnUpdate="0"/>
+        <default expression="" field="label_x" applyOnUpdate="0"/>
+        <default expression="" field="label_y" applyOnUpdate="0"/>
+        <default expression="" field="label_rota" applyOnUpdate="0"/>
+        <default expression="" field="always_sho" applyOnUpdate="0"/>
+        <default expression="" field="resident_a" applyOnUpdate="0"/>
+        <default expression="" field="auxiliary_storage_labeling_show" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="osm_id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="highway" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="waterway" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="aerialway" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="barrier" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="man_made" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="z_order" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="other_tags" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="never_show" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_x" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_y" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label_rota" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="always_sho" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="resident_a" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="auxiliary_storage_labeling_show" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="osm_id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="highway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="waterway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="aerialway" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="barrier" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="man_made" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="z_order" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="other_tags" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="never_show" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_x" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_y" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label_rota" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="always_sho" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="resident_a" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="auxiliary_storage_labeling_show" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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 field="osm_id" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="highway" desc="" exp=""/>
+        <constraint field="waterway" desc="" exp=""/>
+        <constraint field="aerialway" desc="" exp=""/>
+        <constraint field="barrier" desc="" exp=""/>
+        <constraint field="man_made" desc="" exp=""/>
+        <constraint field="z_order" desc="" exp=""/>
+        <constraint field="other_tags" desc="" exp=""/>
+        <constraint field="never_show" desc="" exp=""/>
+        <constraint field="label_x" desc="" exp=""/>
+        <constraint field="label_y" desc="" exp=""/>
+        <constraint field="label_rota" desc="" exp=""/>
+        <constraint field="always_sho" desc="" exp=""/>
+        <constraint field="resident_a" desc="" exp=""/>
+        <constraint field="auxiliary_storage_labeling_show" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column width="-1" name="osm_id" type="field" hidden="0"/>
-          <column width="160" name="name" type="field" hidden="0"/>
-          <column width="-1" name="z_order" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="highway" type="field" hidden="0"/>
-          <column width="-1" name="waterway" type="field" hidden="0"/>
-          <column width="-1" name="aerialway" type="field" hidden="0"/>
-          <column width="-1" name="barrier" type="field" hidden="0"/>
-          <column width="-1" name="man_made" type="field" hidden="0"/>
-          <column width="142" name="other_tags" type="field" hidden="0"/>
-          <column width="-1" name="never_show" type="field" hidden="0"/>
-          <column width="-1" name="label_x" type="field" hidden="0"/>
-          <column width="-1" name="label_y" type="field" hidden="0"/>
-          <column width="-1" name="label_rota" type="field" hidden="0"/>
-          <column width="-1" name="always_sho" type="field" hidden="0"/>
-          <column width="-1" name="resident_a" type="field" hidden="0"/>
-          <column width="-1" name="auxiliary_storage_labeling_show" type="field" hidden="0"/>
+          <column width="-1" name="osm_id" hidden="0" type="field"/>
+          <column width="160" name="name" hidden="0" type="field"/>
+          <column width="-1" name="z_order" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="highway" hidden="0" type="field"/>
+          <column width="-1" name="waterway" hidden="0" type="field"/>
+          <column width="-1" name="aerialway" hidden="0" type="field"/>
+          <column width="-1" name="barrier" hidden="0" type="field"/>
+          <column width="-1" name="man_made" hidden="0" type="field"/>
+          <column width="142" name="other_tags" hidden="0" type="field"/>
+          <column width="-1" name="never_show" hidden="0" type="field"/>
+          <column width="-1" name="label_x" hidden="0" type="field"/>
+          <column width="-1" name="label_y" hidden="0" type="field"/>
+          <column width="-1" name="label_rota" hidden="0" type="field"/>
+          <column width="-1" name="always_sho" hidden="0" type="field"/>
+          <column width="-1" name="resident_a" hidden="0" type="field"/>
+          <column width="-1" name="auxiliary_storage_labeling_show" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16190,40 +16453,40 @@ 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 name="aerialway" labelOnTop="0"/>
@@ -16327,7 +16590,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -16392,7 +16655,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16417,58 +16680,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16499,36 +16762,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -16543,44 +16806,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16603,54 +16866,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <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'"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0"/>
+          <rule filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1"/>
+          <rule filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" symbol="2"/>
+          <rule filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}" symbol="3"/>
+          <rule filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" symbol="4"/>
+          <rule filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16673,47 +16936,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 name="1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16735,47 +16998,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 name="2" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16797,57 +17060,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 name="3" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16869,47 +17132,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 name="4" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -16932,18 +17195,18 @@ def my_form_open(dialog, layer, feature):
               <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"/>
@@ -16960,24 +17223,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"/>
@@ -17000,10 +17263,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"/>
@@ -17012,18 +17275,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"/>
@@ -17040,24 +17303,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"/>
@@ -17081,47 +17344,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 name="5" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="5" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -17143,15 +17406,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>
@@ -17160,32 +17423,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="0.90000000000000002" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="name" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="0.90000000000000002" forcedItalic="0" forcedBold="0" fieldName="name" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="2" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="2" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.69999999999999996" shapeSizeY="1" shapeRadiiX="2">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferSize="2" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="2" shapeOpacity="0.69999999999999996" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="1" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -17200,99 +17463,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="3" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="2" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="0" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="3" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="10" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1.8" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="2" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="2" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="3" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="3" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="10" mergeLines="0" drawLabels="1" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -17301,47 +17564,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -17372,9 +17635,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>
@@ -17382,12 +17645,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -17434,34 +17697,34 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="distance" index="3"/>
       </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 expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="name" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="name" type="field" hidden="0"/>
-          <column width="-1" name="distance" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="name" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17493,10 +17756,10 @@ 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 name="distance" labelOnTop="0"/>
@@ -17510,7 +17773,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiPolygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -17583,58 +17846,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -17665,36 +17928,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -17709,44 +17972,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -17769,42 +18032,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -17823,48 +18086,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 name="@0@0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@0@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -17895,9 +18158,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>
@@ -17905,17 +18168,17 @@ def my_form_open(dialog, layer, feature):
             </layer>
             <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="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"/>
@@ -17930,9 +18193,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>
@@ -17943,11 +18206,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>
@@ -17956,47 +18219,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -18027,9 +18290,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>
@@ -18037,12 +18300,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="1" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="1" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -18065,23 +18328,23 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="FID" index="0"/>
       </aliases>
       <defaults>
-        <default field="FID" expression="" applyOnUpdate="0"/>
+        <default expression="" field="FID" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="FID" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="FID" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint field="FID" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="431" name="type" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="431" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18113,8 +18376,8 @@ 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 name="id" labelOnTop="0"/>
@@ -18126,7 +18389,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -18191,7 +18454,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18216,58 +18479,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18298,36 +18561,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -18342,44 +18605,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18402,61 +18665,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" filter="&quot;status&quot; = 'open'" label="Road Open"/>
-          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" filter="&quot;status&quot; = 'no-parking'" label="No Parking"/>
-          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" filter="&quot;status&quot; = 'lane-closed'" label="Lane Closed"/>
-          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" filter="&quot;status&quot; = 'one-way'" label="One-Way"/>
-          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" filter="&quot;status&quot; = 'closure'" label="Road Closures"/>
+          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0" label="Road Open"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1" label="No Parking"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2" label="Lane Closed"/>
+          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3" label="One-Way"/>
+          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4" label="Road Closures"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18487,50 +18750,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18550,40 +18813,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 name="@1@0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -18606,52 +18869,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 name="2" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="2" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18682,41 +18945,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">
               <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"/>
@@ -18736,46 +18999,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 name="@2@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@2@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -18798,58 +19061,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 name="3" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="3" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -18880,41 +19143,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">
               <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"/>
@@ -18934,46 +19197,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 name="@3@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@3@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -18996,58 +19259,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 name="4" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="4" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -19078,20 +19341,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>
@@ -19100,32 +19363,32 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="9" textOpacity="1" fontWordSpacing="0" namedStyle="Regular" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="times" fontItalic="0">
+          <text-style fontSize="9" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Regular" blendMode="0" isExpression="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="times" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -19140,67 +19403,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="5" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="2" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="4294967295" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="4" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="2" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="5" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -19209,47 +19472,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -19280,9 +19543,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>
@@ -19290,12 +19553,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -19342,34 +19605,34 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="times" index="3"/>
       </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 expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
+        <default expression="" field="status" applyOnUpdate="0"/>
+        <default expression="" field="times" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="status" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="times" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="status" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="times" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="status" desc="" exp=""/>
+        <constraint field="times" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="202" name="type" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="status" type="field" hidden="0"/>
-          <column width="-1" name="times" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="202" name="type" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="status" hidden="0" type="field"/>
+          <column width="-1" name="times" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19401,10 +19664,10 @@ 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 name="id" labelOnTop="0"/>
@@ -19418,21 +19681,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="100000" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="100000" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
-        <xmin>18.37541576228521834</xmin>
-        <ymin>-33.95567171312350752</ymin>
-        <xmax>18.42201008438910748</xmax>
-        <ymax>-33.90011331441002085</ymax>
+        <xmin>18.37543911768802474</xmin>
+        <ymin>-33.95582126985814853</ymin>
+        <xmax>18.42275999405387665</xmax>
+        <ymax>-33.90013265894425842</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37541576228521834</xmin>
-        <ymin>-33.95567171312350752</ymin>
-        <xmax>18.42201008438910748</xmax>
-        <ymax>-33.90011331441002085</ymax>
+        <xmin>18.37543911768802474</xmin>
+        <ymin>-33.95582126985814853</ymin>
+        <xmax>18.42275999405387665</xmax>
+        <ymax>-33.90013265894425842</ymax>
       </wgs84extent>
-      <id>route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)</datasource>
+      <id>route_markers_6943d827_bf32_40af_988d_60a736c1d3e1</id>
+      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=length_m:integer(6,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(4,0)</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -19457,15 +19720,6 @@ def my_form_open(dialog, layer, feature):
         <type></type>
         <title></title>
         <abstract></abstract>
-        <contact>
-          <name></name>
-          <organization></organization>
-          <position></position>
-          <voice></voice>
-          <fax></fax>
-          <email></email>
-          <role></role>
-        </contact>
         <links/>
         <fees></fees>
         <encoding></encoding>
@@ -19482,15 +19736,7 @@ def my_form_open(dialog, layer, feature):
             <geographicflag>false</geographicflag>
           </spatialrefsys>
         </crs>
-        <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
-          <temporal>
-            <period>
-              <start></start>
-              <end></end>
-            </period>
-          </temporal>
-        </extent>
+        <extent/>
       </resourceMetadata>
       <provider encoding="">memory</provider>
       <vectorjoins/>
@@ -19508,58 +19754,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -19590,36 +19836,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -19634,44 +19880,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -19694,54 +19940,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 symbollevels="0" referencescale="-1" type="nullSymbol" forceraster="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{0ffa6f3f-6f8e-491c-81ad-015a65f39b56}">
-          <rule key="{8783c5e4-bc17-4d88-bec2-dbb83066c593}" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{8783c5e4-bc17-4d88-bec2-dbb83066c593}" description="Active routes">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0">
+              <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="0,0,0,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                  <symbol name="markerSymbol" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="0,0,0,255" shapeFillColor="0,0,0,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="markerSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <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">
                       <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"/>
@@ -19764,34 +20010,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 name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -19806,131 +20052,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="3" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="PointGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="PointGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="3" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{10fa4124-46cc-47c8-abf9-a57ba9d4b9ad}" active="0" description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )">
-            <rule key="{2b8e68ce-be16-4623-bce0-9e65634bdfd7}" active="0" description="21KM" filter="&quot;Source&quot; = '21KM'">
+          <rule active="0" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{10fa4124-46cc-47c8-abf9-a57ba9d4b9ad}" description="List for legends">
+            <rule active="0" filter="&quot;Source&quot; = '21KM'" key="{2b8e68ce-be16-4623-bce0-9e65634bdfd7}" description="21KM">
               <settings calloutType="simple">
-                <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0">
+                <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                  <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="210,32,39,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="210,32,39,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                  <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="210,32,39,255" shapeFillColor="210,32,39,255" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                    <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" 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="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"/>
@@ -19945,130 +20191,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                  <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                   <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="3" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-                <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="3" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+                <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{a4031224-6863-4443-9d92-421bcd31ec7b}" active="0" description="10KM" filter="&quot;Source&quot; = '10KM'">
+            <rule active="0" filter="&quot;Source&quot; = '10KM'" key="{a4031224-6863-4443-9d92-421bcd31ec7b}" description="10KM">
               <settings calloutType="simple">
-                <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0">
+                <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                  <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="103,34,144,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="103,34,144,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                  <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="103,34,144,255" shapeFillColor="103,34,144,255" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                    <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" 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="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"/>
@@ -20083,130 +20329,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                  <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                   <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-                <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+                <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{d8cdafa5-1dcf-47dc-bda3-d64d1d4fd1b6}" active="0" description="5KM" filter="&quot;Source&quot; = '5KM'">
+            <rule active="0" filter="&quot;Source&quot; = '5KM'" key="{d8cdafa5-1dcf-47dc-bda3-d64d1d4fd1b6}" description="5KM">
               <settings calloutType="simple">
-                <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0">
+                <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                  <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="145,211,55,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                    <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                  <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeFillColor="145,211,55,255" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                    <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" 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="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"/>
@@ -20221,138 +20467,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                  <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                   <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-                <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+                <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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 key="{d922a9ed-f9f3-49b7-ade9-94d817ff0cd5}" active="0" description="Trail" filter="&quot;Source&quot; = 'Trail'">
+            <rule active="0" filter="&quot;Source&quot; = 'Trail'" key="{d922a9ed-f9f3-49b7-ade9-94d817ff0cd5}" description="Trail">
               <settings calloutType="simple">
-                <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="1" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="255,255,255,255" useSubstitutions="0" fontUnderline="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0">
+                <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="255,255,255,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="1" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                   <families/>
-                  <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="64" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                  <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                  <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="145,211,55,255" shapeSizeX="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeBorderWidth="1" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="1" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="1">
-                    <symbol name="markerSymbol" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="64"/>
+                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                  <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="1" shapeBorderWidthUnit="MM" shapeBorderWidth="1" shapeRadiiY="1" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="145,211,55,255" shapeFillColor="145,211,55,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+                    <symbol name="markerSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <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">
                         <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"/>
@@ -20375,34 +20621,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 name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                    <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" 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="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"/>
@@ -20417,77 +20663,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                  <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                   <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" plussign="0" decimals="0" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-                <placement preserveRotation="1" dist="2" lineAnchorTextPoint="CenterOfText" priority="10" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="AllowOverlapIfRequired" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="1" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="6" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="20" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="PointGeometry"/>
-                <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="2" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+                <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="0" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+                <placement layerType="PointGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" quadOffset="4" allowDegraded="1" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="6" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="20" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="2" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="10" rotationUnit="AngleDegrees"/>
+                <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -20497,13 +20743,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>
@@ -20512,47 +20758,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="100000">
-          <fontProperties style="" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="100000" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -20583,9 +20829,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>
@@ -20593,12 +20839,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -20613,8 +20859,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20623,8 +20869,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20633,8 +20879,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20643,8 +20889,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20653,8 +20899,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20663,8 +20909,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20673,8 +20919,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20683,18 +20929,25 @@ def my_form_open(dialog, layer, feature):
           <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 name="Sort" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
         <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option 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>
@@ -20703,8 +20956,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20713,8 +20966,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20723,8 +20976,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -20746,77 +20999,81 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="Distance" index="5"/>
         <alias name="" field="RouteLen" index="6"/>
         <alias name="" field="Source" index="7"/>
-        <alias name="" field="length_m" index="8"/>
-        <alias name="" field="length_km" index="9"/>
-        <alias name="" field="org_fid" index="10"/>
-        <alias name="" field="distance" index="11"/>
-        <alias name="" field="quadrant" index="12"/>
+        <alias name="" field="Sort" index="8"/>
+        <alias name="" field="length_m" index="9"/>
+        <alias name="" field="length_km" index="10"/>
+        <alias name="" field="org_fid" index="11"/>
+        <alias name="" field="distance" index="12"/>
+        <alias name="" field="quadrant" index="13"/>
       </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="length_m" expression="" applyOnUpdate="0"/>
-        <default field="length_km" expression="" applyOnUpdate="0"/>
-        <default field="org_fid" expression="" applyOnUpdate="0"/>
-        <default field="distance" expression="" applyOnUpdate="0"/>
-        <default field="quadrant" expression="" applyOnUpdate="0"/>
+        <default expression="" field="Name" applyOnUpdate="0"/>
+        <default expression="" field="descriptio" applyOnUpdate="0"/>
+        <default expression="" field="timestamp" applyOnUpdate="0"/>
+        <default expression="" field="begin" applyOnUpdate="0"/>
+        <default expression="" field="end" applyOnUpdate="0"/>
+        <default expression="" field="Distance" applyOnUpdate="0"/>
+        <default expression="" field="RouteLen" applyOnUpdate="0"/>
+        <default expression="" field="Source" applyOnUpdate="0"/>
+        <default expression="" field="Sort" applyOnUpdate="0"/>
+        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
+        <default expression="" field="org_fid" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default expression="" field="quadrant" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Distance" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="org_fid" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="quadrant" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Sort" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="quadrant" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="quadrant" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="Sort" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="quadrant" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
         <columns>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="org_fid" type="field" hidden="0"/>
-          <column width="-1" name="distance" type="field" hidden="0"/>
-          <column width="-1" name="Name" type="field" hidden="0"/>
-          <column width="-1" name="Source" type="field" hidden="0"/>
-          <column width="-1" name="RouteLen" type="field" hidden="0"/>
-          <column width="-1" name="descriptio" type="field" hidden="0"/>
-          <column width="-1" name="timestamp" type="field" hidden="0"/>
-          <column width="-1" name="begin" type="field" hidden="0"/>
-          <column width="-1" name="end" type="field" hidden="0"/>
-          <column width="-1" name="Distance" type="field" hidden="0"/>
-          <column width="-1" name="length_km" type="field" hidden="0"/>
-          <column width="-1" name="quadrant" type="field" hidden="0"/>
-          <column width="-1" name="length_m" type="field" hidden="0"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="Distance" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="Sort" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20848,19 +21105,19 @@ 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="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="Source" editable="1"/>
+        <field name="begin" editable="1"/>
+        <field name="descriptio" editable="1"/>
+        <field name="distance" editable="1"/>
+        <field name="end" editable="1"/>
+        <field name="length_km" editable="1"/>
+        <field name="length_m" editable="1"/>
+        <field name="org_fid" editable="1"/>
+        <field name="quadrant" editable="1"/>
+        <field name="timestamp" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="Distance" labelOnTop="0"/>
@@ -20897,7 +21154,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiPolygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -20970,58 +21227,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -21052,36 +21309,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -21096,44 +21353,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -21156,38 +21413,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="singleSymbol">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="singleSymbol" forceraster="0" enableorderby="0">
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -21202,9 +21459,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>
@@ -21215,10 +21472,10 @@ 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>
@@ -21261,30 +21518,30 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="rotation" index="2"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="area" expression="" applyOnUpdate="0"/>
-        <default field="rotation" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="area" applyOnUpdate="0"/>
+        <default expression="" field="rotation" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="area" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="rotation" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="area" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="rotation" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="area" desc="" exp=""/>
+        <constraint field="rotation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="area" type="field" hidden="0"/>
-          <column width="-1" name="rotation" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="area" hidden="0" type="field"/>
+          <column width="-1" name="rotation" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21307,7 +21564,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -21372,7 +21629,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21397,58 +21654,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -21479,36 +21736,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -21523,44 +21780,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -21583,49 +21840,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances" checkstate="0"/>
+          <rule checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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">
               <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"/>
@@ -21648,20 +21905,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>
@@ -21673,15 +21930,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>
@@ -21690,47 +21947,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -21761,9 +22018,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>
@@ -21771,12 +22028,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -21812,8 +22069,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -21829,8 +22086,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -21839,8 +22096,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -21904,70 +22161,70 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="last_runne" index="12"/>
       </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 expression="" field="Name" applyOnUpdate="0"/>
+        <default expression="" field="descriptio" applyOnUpdate="0"/>
+        <default expression="" field="timestamp" applyOnUpdate="0"/>
+        <default expression="" field="begin" applyOnUpdate="0"/>
+        <default expression="" field="end" applyOnUpdate="0"/>
+        <default expression="" field="RouteLen" applyOnUpdate="0"/>
+        <default expression="" field="Source" applyOnUpdate="0"/>
+        <default expression="" field="length_m" applyOnUpdate="0"/>
+        <default expression="" field="length_km" applyOnUpdate="0"/>
+        <default expression="" field="org_fid" applyOnUpdate="0"/>
+        <default expression="" field="distance" applyOnUpdate="0"/>
+        <default expression="" field="first_runn" applyOnUpdate="0"/>
+        <default expression="" field="last_runne" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="Name" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="descriptio" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="timestamp" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="begin" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="end" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="RouteLen" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="Source" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_m" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="length_km" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="org_fid" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="distance" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="first_runn" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="last_runne" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Name" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="descriptio" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="timestamp" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="begin" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="end" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="RouteLen" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="Source" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_m" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="length_km" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="org_fid" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="distance" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="first_runn" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="last_runne" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="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 field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="first_runn" desc="" exp=""/>
+        <constraint field="last_runne" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column width="179" name="begin" type="field" hidden="0"/>
-          <column width="-1" name="RouteLen" type="field" hidden="0"/>
-          <column width="-1" name="Source" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="Name" type="field" hidden="0"/>
-          <column width="-1" name="length_m" type="field" hidden="0"/>
-          <column width="-1" name="length_km" type="field" hidden="0"/>
-          <column width="-1" name="org_fid" type="field" hidden="0"/>
-          <column width="-1" name="first_runn" type="field" hidden="0"/>
-          <column width="-1" name="last_runne" type="field" hidden="0"/>
-          <column width="-1" name="descriptio" type="field" hidden="0"/>
-          <column width="-1" name="timestamp" type="field" hidden="0"/>
-          <column width="-1" name="end" type="field" hidden="0"/>
-          <column width="-1" name="distance" type="field" hidden="0"/>
+          <column width="179" name="begin" hidden="0" type="field"/>
+          <column width="-1" name="RouteLen" hidden="0" type="field"/>
+          <column width="-1" name="Source" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="Name" hidden="0" type="field"/>
+          <column width="-1" name="length_m" hidden="0" type="field"/>
+          <column width="-1" name="length_km" hidden="0" type="field"/>
+          <column width="-1" name="org_fid" hidden="0" type="field"/>
+          <column width="-1" name="first_runn" hidden="0" type="field"/>
+          <column width="-1" name="last_runne" hidden="0" type="field"/>
+          <column width="-1" name="descriptio" hidden="0" type="field"/>
+          <column width="-1" name="timestamp" hidden="0" type="field"/>
+          <column width="-1" name="end" hidden="0" type="field"/>
+          <column width="-1" name="distance" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21999,31 +22256,31 @@ 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 name="Distance" labelOnTop="0"/>
@@ -22058,7 +22315,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiLineString" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Line" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="0" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Line" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="0" wkbType="MultiLineString" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -22131,58 +22388,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -22213,36 +22470,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -22257,44 +22514,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -22317,58 +22574,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
+      <renderer-v2 symbollevels="0" referencescale="-1" type="RuleRenderer" forceraster="0" enableorderby="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" filter="&quot;type&quot; IS 'car'" label="Car"/>
-          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" filter="&quot;type&quot; IS 'walk'" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0" label="Car"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1" label="Walking"/>
         </rules>
         <symbols>
-          <symbol name="0" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -22399,50 +22656,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 name="1" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -22473,30 +22730,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">
               <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"/>
@@ -22516,33 +22773,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 name="@1@1" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+              <symbol name="@1@1" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <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">
                   <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"/>
@@ -22558,32 +22815,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 name="@@1@1@0" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                  <symbol name="@@1@1@0" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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="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"/>
@@ -22598,9 +22855,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>
@@ -22613,11 +22870,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>
@@ -22626,47 +22883,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -22697,9 +22954,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>
@@ -22707,12 +22964,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="2" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="2" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -22743,26 +23000,26 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="type" index="1"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="type" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="type" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="type" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="type" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="type" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22794,8 +23051,8 @@ 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 name="id" labelOnTop="0"/>
@@ -22807,7 +23064,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="Point" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Point" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="0" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Point" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="Point" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="0" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -22880,58 +23137,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -22962,36 +23219,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -23006,44 +23263,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -23066,44 +23323,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 symbollevels="0" referencescale="-1" type="nullSymbol" forceraster="0" enableorderby="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="15" textOpacity="1" fontWordSpacing="0" namedStyle="Semibold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" useSubstitutions="0" fontUnderline="0" fieldName="label" fontItalic="0">
+          <text-style fontSize="15" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" legendString="Aa" textOrientation="horizontal" namedStyle="Semibold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="1" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="1" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -23118,66 +23375,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-          <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="5" lineAnchorType="0" quadOffset="4" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="0" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="0" offsetUnits="MM" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-          <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="0" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="0" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" obstacleFactor="1" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="2000" fontMaxPixelSize="10000"/>
+          <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="3" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+          <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="0" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="4" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MM" placement="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="5" rotationUnit="AngleDegrees"/>
+          <rendering obstacleType="0" scaleMax="0" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="2000" upsidedownLabels="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="0" mergeLines="0" drawLabels="1" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -23186,47 +23443,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="1" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" style="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -23257,9 +23514,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>
@@ -23267,12 +23524,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="18" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="18" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -23303,26 +23560,26 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="label" index="1"/>
       </aliases>
       <defaults>
-        <default field="id" expression="" applyOnUpdate="0"/>
-        <default field="label" expression="" applyOnUpdate="0"/>
+        <default expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="label" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" name="label" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23354,8 +23611,8 @@ 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 name="id" labelOnTop="0"/>
@@ -23367,7 +23624,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" symbologyReferenceScale="-1" hasScaleBasedVisibilityFlag="0" wkbType="MultiPolygon" styleCategories="AllStyleCategories" simplifyAlgorithm="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="Polygon" simplifyLocal="1" maxScale="0" legendPlaceholderImage="" autoRefreshTime="0" minScale="100000000" readOnly="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyMaxScale="1" type="vector" refreshOnNotifyEnabled="0">
+    <maplayer maxScale="0" simplifyDrawingTol="1" hasScaleBasedVisibilityFlag="0" simplifyAlgorithm="0" geometry="Polygon" simplifyLocal="1" type="vector" simplifyMaxScale="1" styleCategories="AllStyleCategories" symbologyReferenceScale="-1" labelsEnabled="1" wkbType="MultiPolygon" legendPlaceholderImage="" autoRefreshEnabled="0" minScale="100000000" simplifyDrawingHints="1" autoRefreshTime="0" readOnly="0" refreshOnNotifyMessage="" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -23432,7 +23689,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minz="0" maxz="0" maxy="0" miny="0" dimensions="2" minx="0" maxx="0" crs=""/>
+          <spatial crs="" maxz="0" dimensions="2" minz="0" miny="0" maxy="0" maxx="0" minx="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23457,58 +23714,58 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal durationField="" durationUnit="min" fixedDuration="0" startExpression="" mode="0" limitMode="0" endExpression="" enabled="0" startField="" endField="" accumulate="0">
+      <temporal limitMode="0" startField="" endField="" endExpression="" fixedDuration="0" enabled="0" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" extrusionEnabled="0" type="IndividualFeatures" zoffset="0" symbology="Line" zscale="1" binding="Centroid" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" clamping="Terrain">
+      <elevation zoffset="0" symbology="Line" zscale="1" clamping="Terrain" extrusionEnabled="0" extrusion="0" type="IndividualFeatures" respectLayerSymbol="1" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -23539,36 +23796,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -23583,44 +23840,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -23643,46 +23900,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 forceraster="0" enableorderby="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
+      <renderer-v2 symbollevels="0" referencescale="-1" type="nullSymbol" forceraster="0" enableorderby="0"/>
       <labeling type="rule-based">
         <rules key="{5dc8b36b-2058-4678-ad09-9a66ad011982}">
-          <rule key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'RouteLen' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'RouteLen' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{6ef417ce-9c3a-42d0-a533-3a83b1a257ea}" description="Show water tables">
             <settings calloutType="simple">
-              <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" legendString="Aa" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="8" textOpacity="0.90000000000000002" fontWordSpacing="0" namedStyle="Bold" fontSizeUnit="Point" capitalization="0" isExpression="0" fontFamily="Myriad Pro" fontWeight="75" fontStrikeout="0" textColor="31,120,180,255" useSubstitutions="0" fontUnderline="0" fieldName="label" fontItalic="0">
+              <text-style fontSize="8" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="31,120,180,255" legendString="Aa" textOrientation="horizontal" namedStyle="Bold" blendMode="0" isExpression="0" allowHtml="0" fontWeight="75" textOpacity="0.90000000000000002" forcedItalic="0" forcedBold="0" fieldName="label" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" useSubstitutions="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
                 <families/>
-                <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="0" bufferSizeUnits="MM" bufferSize="0.75" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-                <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-                <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="-0.14999999999999999" shapeBorderWidthUnit="MM" shapeBorderColor="31,120,206,255" shapeSizeX="0.75" shapeSizeType="0" shapeFillColor="255,255,255,204" shapeSVGFile="" shapeBorderWidth="0.75" shapeDraw="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeRadiiY="0.5" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="0.59999999999999998" shapeSizeY="0.29999999999999999" shapeRadiiX="0.5">
-                  <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+                <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferSize="0.75" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="0" bufferJoinStyle="128"/>
+                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+                <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeType="0" shapeSizeX="0.75" shapeBorderWidthUnit="MM" shapeBorderWidth="0.75" shapeRadiiY="0.5" shapeOpacity="0.59999999999999998" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="31,120,206,255" shapeFillColor="255,255,255,204" shapeSizeUnit="MM" shapeJoinStyle="128" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0.29999999999999999" shapeRotation="0" shapeSizeType="0">
+                  <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" 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,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"/>
@@ -23697,56 +23954,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+                <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
                 <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" plussign="0" decimals="3" wrapChar="" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" formatNumbers="0" autoWrapLength="0"/>
-              <placement preserveRotation="1" dist="0" lineAnchorTextPoint="CenterOfText" priority="5" lineAnchorType="0" quadOffset="1" distUnits="MM" polygonPlacementFlags="2" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" fitInPolygonOnly="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" overlapHandling="PreventOverlap" centroidInside="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" rotationUnit="AngleDegrees" placementFlags="10" centroidWhole="1" allowDegraded="0" lineAnchorClipping="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" repeatDistance="0" placement="0" offsetUnits="MapUnit" lineAnchorPercent="0.5" maxCurvedCharAngleIn="25" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" rotationAngle="0" overrunDistanceUnit="MM" layerType="UnknownGeometry"/>
-              <rendering obstacleType="0" drawLabels="1" labelPerPart="0" zIndex="5" minFeatureSize="0" obstacle="1" scaleVisibility="0" scaleMax="10000000" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" obstacleFactor="0.76000000000000001" mergeLines="0" unplacedVisibility="0" fontLimitPixelSize="0" fontMinPixelSize="3" maxNumLabels="6" fontMaxPixelSize="10000"/>
+              <text-format wrapChar="" leftDirectionSymbol="&lt;" reverseDirectionSymbol="0" multilineAlign="1" plussign="0" addDirectionSymbol="0" autoWrapLength="0" decimals="3" useMaxLineLengthForAutoWrap="1" placeDirectionSymbol="0" formatNumbers="0" rightDirectionSymbol=">"/>
+              <placement layerType="UnknownGeometry" lineAnchorPercent="0.5" geometryGeneratorEnabled="0" geometryGeneratorType="PointGeometry" xOffset="1" overlapHandling="PreventOverlap" lineAnchorClipping="0" quadOffset="1" allowDegraded="0" lineAnchorTextPoint="CenterOfText" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" distMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" offsetType="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetUnits="MapUnit" placement="0" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleIn="25" overrunDistance="0" repeatDistanceUnits="MM" maxCurvedCharAngleOut="-25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="1" dist="0" centroidInside="0" distUnits="MM" lineAnchorType="0" repeatDistance="0" rotationAngle="0" yOffset="0" preserveRotation="1" overrunDistanceUnit="MM" placementFlags="10" polygonPlacementFlags="2" priority="5" rotationUnit="AngleDegrees"/>
+              <rendering obstacleType="0" scaleMax="10000000" fontMinPixelSize="3" obstacle="1" scaleVisibility="0" fontLimitPixelSize="0" maxNumLabels="6" upsidedownLabels="0" scaleMin="1" limitNumLabels="0" fontMaxPixelSize="10000" zIndex="5" mergeLines="0" drawLabels="1" obstacleFactor="0.76000000000000001" minFeatureSize="0" unplacedVisibility="0" labelPerPart="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 name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; is_animated=&quot;0&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; is_animated=&quot;0&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; frame_rate=&quot;10&quot; type=&quot;line&quot; alpha=&quot;1&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 locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&quot; enabled=&quot;1&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>
@@ -23755,11 +24012,11 @@ 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="COALESCE( &quot;id&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;id&quot;, '&lt;NULL>' )" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -23768,47 +24025,47 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory spacingUnit="MM" penColor="#000000" enabled="0" sizeType="MM" scaleDependency="Area" barWidth="5" scaleBasedVisibility="0" penWidth="0" width="15" penAlpha="255" sizeScale="3x:0,0,0,0,0,0" diagramOrientation="Up" labelPlacementMethod="XHeight" backgroundAlpha="255" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" direction="1" rotationOffset="270" spacingUnitScale="3x:0,0,0,0,0,0" spacing="0" minimumSize="0" opacity="1" maxScaleDenominator="1e+08" showAxis="0" backgroundColor="#ffffff" height="15" minScaleDenominator="0">
-          <fontProperties style="" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
-          <attribute field="" colorOpacity="1" color="#000000" label=""/>
+        <DiagramCategory backgroundColor="#ffffff" scaleBasedVisibility="0" height="15" minScaleDenominator="0" labelPlacementMethod="XHeight" width="15" lineSizeType="MM" direction="1" diagramOrientation="Up" barWidth="5" minimumSize="0" enabled="0" spacing="0" lineSizeScale="3x:0,0,0,0,0,0" showAxis="0" rotationOffset="270" spacingUnit="MM" sizeType="MM" scaleDependency="Area" opacity="1" penAlpha="255" spacingUnitScale="3x:0,0,0,0,0,0" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" penColor="#000000" sizeScale="3x:0,0,0,0,0,0">
+          <fontProperties italic="0" underline="0" bold="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" style=""/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -23839,9 +24096,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>
@@ -23849,12 +24106,12 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings linePlacementFlags="2" placement="0" obstacle="0" showAll="1" dist="0" zIndex="0" priority="0">
+      <DiagramLayerSettings zIndex="0" linePlacementFlags="2" dist="0" placement="0" showAll="1" priority="0" obstacle="0">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <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>
@@ -23869,8 +24126,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -23879,8 +24136,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -23889,8 +24146,8 @@ def my_form_open(dialog, layer, feature):
           <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>
@@ -23910,34 +24167,34 @@ def my_form_open(dialog, layer, feature):
         <alias name="" field="races" index="3"/>
       </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 expression="" field="id" applyOnUpdate="0"/>
+        <default expression="" field="table_set" applyOnUpdate="0"/>
+        <default expression="" field="label" applyOnUpdate="0"/>
+        <default expression="" field="races" applyOnUpdate="0"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" field="id" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="table_set" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="label" unique_strength="0" constraints="0" exp_strength="0"/>
-        <constraint notnull_strength="0" field="races" unique_strength="0" constraints="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="id" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="table_set" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="label" constraints="0" notnull_strength="0" exp_strength="0"/>
+        <constraint unique_strength="0" field="races" constraints="0" notnull_strength="0" exp_strength="0"/>
       </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="id" desc="" exp=""/>
+        <constraint field="table_set" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
+        <constraint field="races" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
+        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
       </attributeactions>
       <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="-1" name="table_set" type="field" hidden="0"/>
-          <column width="-1" name="label" type="field" hidden="0"/>
-          <column width="130" name="races" type="field" hidden="0"/>
+          <column width="-1" name="id" hidden="0" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" name="table_set" hidden="0" type="field"/>
+          <column width="-1" name="label" hidden="0" type="field"/>
+          <column width="130" name="races" hidden="0" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23969,10 +24226,10 @@ 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 editable="1" name="races"/>
-        <field editable="1" name="table_set"/>
+        <field name="id" editable="1"/>
+        <field name="label" editable="1"/>
+        <field name="races" editable="1"/>
+        <field name="table_set" editable="1"/>
       </editable>
       <labelOnTop>
         <field name="id" labelOnTop="0"/>
@@ -24012,7 +24269,8 @@ def my_form_open(dialog, layer, feature):
     <layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
     <layer id="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792"/>
     <layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
-    <layer id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
+    <layer id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
+    <layer id="marshals_by_position20161003112326575"/>
   </layerorder>
   <properties>
     <DefaultStyles/>
@@ -24181,7 +24439,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Routes/Gun Run 2022 - Routes rev 2.0.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal overview/Gun Run 2022 - Marshal Plan Day 1 rev 1.0.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -24343,287 +24601,317 @@ 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 style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Access Routes">
+      <layer expanded="1" visible="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0"/>
+      <layer expanded="0" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="Elevation"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="All Routes" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="All Routes">
+      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{bf1a10e0-59dd-4cae-9422-60e7158499cb}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer expanded="1" visible="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="Marshals"/>
-        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Ask Me"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Fencing">
+      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" 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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Marshal map - inset">
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" 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 style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Marshal map - main">
+      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
         <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
+      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{bb4463e8-e33a-4475-878c-fd2d7b636418}"/>
+        <checked-legend-node id="{b3b38ee9-c245-4839-b078-3b966a2a5c4e}"/>
         <checked-legend-node id="{9da1c54c-0ca9-4db9-a722-ce3f53ccd358}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal overview" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-        <checked-legend-node id="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
+    <visibility-preset has-expanded-info="1" name="Marshal overview" has-checked-group-info="1">
+      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Proposed Routes" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Routes" has-expanded-info="1" has-checked-group-info="1">
-      <layer style="default" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" expanded="1"/>
-      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8"/>
-      <layer style="default" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" expanded="1"/>
-      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <layer expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" 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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="water_tables20170921142016467" visible="0" expanded="1"/>
+      <layer expanded="1" visible="0" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" style="default"/>
+      <expanded-legend-nodes id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" visible="0" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <layer expanded="1" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" style="default"/>
+      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <layer expanded="1" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" style="default"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Proposed Routes">
+      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" 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" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" 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="Start and Finish pages"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Map"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Routes" has-checked-group-info="1">
+      <layer expanded="1" visible="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" style="default"/>
+      <expanded-legend-nodes id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+      <layer expanded="1" visible="0" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="0" visible="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" 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="{ead1c5b2-1bdf-46f1-9a2d-4cfa2c6acb18}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer expanded="1" visible="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" visible="1" id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" style="default"/>
+      <expanded-legend-nodes id="route_markers_6943d827_bf32_40af_988d_60a736c1d3e1"/>
+      <layer expanded="1" visible="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer expanded="1" visible="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" style="default"/>
+      <expanded-legend-nodes id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+      <layer expanded="1" visible="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" 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="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{29865286-9e35-459b-929c-beb87e7538de}"/>
+      </checked-legend-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="Routes/Markers"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Routes"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
+      <layer expanded="1" visible="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer expanded="1" visible="1" id="water_tables20170921142016467" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer expanded="1" visible="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer expanded="0" visible="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer expanded="1" visible="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer expanded="1" visible="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer expanded="1" visible="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <expanded-group-nodes>
+        <expanded-group-node id="Marshal pages"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Fencing and Cones"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -24650,31 +24938,31 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout worldFileMap="" name="Routes" units="mm" printResolution="144">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Routes" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -24689,49 +24977,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{ec8d0c69-d8e7-4e1f-86d3-4972cb104f88}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -24746,59 +25034,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" position="0" page="0" units="mm"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="14.1764,7.471,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="[%&quot;Distance&quot;%]" frame="false" visibility="1" halign="1" zValue="9" positionOnPage="9.44946,191.611,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="9.44946,191.611,mm" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="14.1764,7.471,mm" referencePoint="0" labelText="[%&quot;Distance&quot;%]" htmlState="0" zValue="9" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="9.44946,191.611,mm" frame="false" marginY="1" uuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.44946,191.611,mm" templateUuid="{75130731-fb08-45a1-8b47-f12b31dcbba0}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="14" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -24813,65 +25101,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="29.2025,7.272,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" marginX="0" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="RACE ROUTE" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="24.2445,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="24.2445,191.81,mm" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="29.2025,7.272,mm" referencePoint="0" labelText="RACE ROUTE" htmlState="0" zValue="8" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="24.2445,191.81,mm" frame="false" marginY="1" uuid="{d9f4225c-620f-4a62-a293-599f109f5206}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="24.2445,191.81,mm" templateUuid="{d9f4225c-620f-4a62-a293-599f109f5206}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="14" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -24886,65 +25174,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="57.4836,6.8714,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.0" frame="false" visibility="1" halign="2" zValue="6" positionOnPage="204.225,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="204.225,191.81,mm" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="6" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="204.225,191.81,mm" frame="false" marginY="1" uuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="204.225,191.81,mm" templateUuid="{1915042c-b33e-434c-ba57-48f7179a5efa}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -24959,65 +25247,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="51.6706,6.60801,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 September 2020" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="210.038,199.082,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="210.038,199.082,mm" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" referencePoint="0" labelText="Sunday, 20 September 2020" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="210.038,199.082,mm" frame="false" marginY="1" uuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="210.038,199.082,mm" templateUuid="{63076b5e-d09e-4965-ae1b-f2947fd72e33}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -25032,39 +25320,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" frameJoinStyle="miter" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" groupUuid="" pictureWidth="29.7523" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="4" positionLock="true" frame="false" pictureHeight="17.4074" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="4" positionOnPage="262.196,188.218,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="262.196,188.218,mm" northMode="0" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" referencePoint="0" zValue="4" anchorPoint="4" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="262.196,188.218,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="17.4074" groupUuid="" pictureWidth="29.7523" northMode="0" position="262.196,188.218,mm" templateUuid="{335b87f1-e52c-47f9-b422-f15fcba9b3a1}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -25072,42 +25360,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="251.959,0.1,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="3" positionOnPage="9.59946,198.832,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="9.59946,198.832,mm" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="251.959,0.1,mm" referencePoint="0" zValue="3" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="9.59946,198.832,mm" frame="false" uuid="{5e005555-54ea-40fd-a5a7-20254950b890}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.59946,198.832,mm" templateUuid="{5e005555-54ea-40fd-a5a7-20254950b890}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -25122,61 +25410,61 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="67.7828,166.874,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="2" positionOnPage="5.86559,4.09761,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="5.86559,4.09761,mm" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" excludeFromExports="0" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="67.7828,166.874,mm" referencePoint="0" isTemporal="0" zValue="2" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.86559,4.09761,mm" frame="true" mapRotation="0" uuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{8a15c820-5d77-4c0a-ab2e-6ede543a3055}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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="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>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" xmin="18.37288570000000121" ymax="-33.91513741583252539"/>
+        <Extent ymin="-33.94652930000000168" xmax="18.38563681624126289" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -25191,45 +25479,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -25260,44 +25548,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -25320,40 +25608,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -25368,29 +25656,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -25400,43 +25688,43 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" frameJoinStyle="round" size="282.012,174.44,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="9.44946,9.08557,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="9.44946,9.08557,mm" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" excludeFromExports="0" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="282.012,174.44,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="9.44946,9.08557,mm" frame="true" mapRotation="0" uuid="{b35d820c-6054-4426-a840-5216bed2ca94}" visibility="1" excludeFromExports="0" frameJoinStyle="round" groupUuid="" position="9.44946,9.08557,mm" templateUuid="{b35d820c-6054-4426-a840-5216bed2ca94}" positionLock="true" id="" opacity="1" outlineWidthM="0.15,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END" 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 '13000'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10000'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '5500'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '24000'&#xa;END" type="QString"/>
+                  <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.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END" 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.370'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.374'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3975'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '18.36'&#xa;END" type="QString"/>
+                  <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.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END" 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.930'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.923'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.912'&#xa;WHEN &quot;Source&quot; = 'Trail'  THEN '-33.959'&#xa;END" type="QString"/>
+                  <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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.4199345745815819" ymin="-33.91199999999999903" xmin="18.39750000000000085" ymax="-33.89812294355778732"/>
+        <Extent ymin="-33.92999999999999972" xmax="18.42303517425787263" ymax="-33.89719473757251222" xmin="18.37000000000000099"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -25451,45 +25739,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -25520,44 +25808,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -25580,40 +25868,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -25628,29 +25916,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -25660,60 +25948,60 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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="1" name="pdfAppendGeoreference" type="QString"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="QString"/>
-          <Option value="1" name="pdfSimplify" 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="pdfAppendGeoreference" value="1" type="QString"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="QString"/>
+          <Option name="pdfSimplify" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" pageNameExpression="&quot;Distance&quot;" sortKey="&quot;Sort&quot;" hideCoverage="0" coverageLayerName="all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" coverageLayerProvider="ogr" enabled="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortAscending="1" filterFeatures="1"/>
+      <Atlas sortFeatures="1" sortKey="&quot;Sort&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerName="all_routes" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="0" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" filterFeatures="1" featureFilter="regexp_match( &quot;Distance&quot;, '(5|10|21|Trail)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshals" units="mm" printResolution="120">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshals" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -25728,49 +26016,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -25785,9 +26073,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>
@@ -25795,15 +26083,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem excludeFromExports="0" symbolHeight="4" type="65642" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" boxSpace="2" positionLock="true" equalColumnWidth="1" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="7" columnSpace="2" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="110.353,5.04491,mm" frame="true" zValue="5" opacity="1" splitLayer="0" outlineWidthM="0.1,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="110.353,5.04491,mm" id="" groupUuid="" rasterBorderWidth="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="bevel" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" size="39.4312,46.1,mm" lineSpacing="1">
-        <FrameColor red="128" green="128" alpha="255" blue="128"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.1,mm" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="true" wmsLegendWidth="50" positionOnPage="110.353,5.04491,mm" itemRotation="0" zValue="5" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="110.353,5.04491,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="39.4312,46.1,mm" positionLock="true" frameJoinStyle="bevel" background="true" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorderWidth="0">
+        <FrameColor blue="128" green="128" red="128" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -25811,48 +26099,48 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="Regular" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="1" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" alignment="1" marginLeft="2" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <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 name="Fencing and Cones" checked="Qt::Unchecked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Unchecked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing">
               <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>
@@ -25860,62 +26148,62 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.2,mm" frameJoinStyle="miter" size="56.5192,54.5647,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="4" positionOnPage="98.7828,149.027,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="98.7828,149.027,mm" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" excludeFromExports="0" followPresetName="Marshal map - inset">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="56.5192,54.5647,mm" referencePoint="0" isTemporal="0" zValue="4" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="98.7828,149.027,mm" frame="true" mapRotation="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="98.7828,149.027,mm" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" positionLock="true" id="" opacity="1" outlineWidthM="0.2,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal map - inset" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
-        <Extent xmax="18.41493455420295433" ymin="-33.90316824413850583" xmin="18.41064302246786966" ymax="-33.89902512102636223"/>
+        <Extent ymin="-33.90316824413850583" xmax="18.41493455420295433" ymax="-33.89902512102636223" xmin="18.41064302246786966"/>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -25946,44 +26234,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -26006,40 +26294,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -26054,29 +26342,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -26084,28 +26372,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview name="Overview 1" position="3" blendMode="0" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" inverted="0">
-          <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <ComposerMapOverview position="3" centered="1" show="1" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" inverted="0" blendMode="0" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -26120,9 +26408,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>
@@ -26130,9 +26418,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>
@@ -26142,67 +26430,67 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="142,187.018,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="3" positionOnPage="3.53,6.0007,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="false" followPreset="true" position="3.53,6.0007,mm" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" excludeFromExports="0" followPresetName="Marshal map - main">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="142,187.018,mm" referencePoint="0" isTemporal="0" zValue="3" itemRotation="0" background="false" followPreset="true" type="65639" blendMode="0" positionOnPage="3.53,6.0007,mm" frame="false" mapRotation="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="3.53,6.0007,mm" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal map - main" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
-        <Extent xmax="18.41330222336237554" ymin="-33.9017728906146445" xmin="18.41227535330844844" ymax="-33.90042047455022356"/>
+        <Extent ymin="-33.9017728906146445" xmax="18.41330222336237554" ymax="-33.90042047455022356" xmin="18.41227535330844844"/>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -26233,44 +26521,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -26293,40 +26581,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -26341,29 +26629,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -26373,20 +26661,20 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" frameJoinStyle="round" size="142.117,187.018,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" groupUuid="" itemRotation="0" sectionY="0" id="" sectionHeight="182.4" hidePageIfEmpty="0" blendMode="0" positionLock="true" frame="false" sectionX="0" visibility="1" sectionWidth="142.117" zValue="2" positionOnPage="290.617,6.0007,mm" referencePoint="2" opacity="1" type="65647" background="false" position="290.617,6.0007,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" hideBackgroundIfEmpty="0" excludeFromExports="0" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
-        <FrameColor red="119" green="119" alpha="255" blue="119"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="142.117,187.018,mm" referencePoint="2" hidePageIfEmpty="0" zValue="2" itemRotation="0" hideBackgroundIfEmpty="0" background="false" sectionX="0" type="65647" blendMode="0" positionOnPage="290.617,6.0007,mm" frame="false" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" visibility="1" excludeFromExports="0" frameJoinStyle="round" sectionY="0" groupUuid="" position="290.617,6.0007,mm" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionWidth="142.117" sectionHeight="182.4" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
+        <FrameColor blue="119" green="119" red="119" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -26394,21 +26682,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" mapUuid="" frameJoinStyle="miter" size="47.1065,27.6,mm" svgBorderColor="0,0,0,255" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" groupUuid="" pictureWidth="47.1065" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="0" positionLock="true" frame="false" pictureHeight="27.561" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="1" positionOnPage="246.665,178.41,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="246.665,178.41,mm" northMode="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="47.1065,27.6,mm" referencePoint="0" zValue="1" anchorPoint="0" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="246.665,178.41,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="27.561" groupUuid="" pictureWidth="47.1065" northMode="0" position="246.665,178.41,mm" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -26416,14 +26704,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame stylesheetEnabled="true" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" resizeMode="0" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" maxBreakDistance="12" evaluateExpressions="true" type="65648" useSmartBreaks="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" url="" 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;}" contentMode="1">
-        <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
+      <LayoutMultiFrame resizeMode="0" evaluateExpressions="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" url="" type="65648" maxBreakDistance="12" stylesheetEnabled="true" contentMode="1" useSmartBreaks="true" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;tr>&lt;td>Name&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', &quot;csv_name&quot;, '')%]&#xa;[%if ( &quot;csv_club&quot; = 'AAC', '&lt;/td>&lt;/tr>', '')%]&#xa;&lt;tr>&lt;td>Club&lt;/td>&lt;td>[%csv_club%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%csv_captain%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;tr>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&amp;nbsp;&lt;/td>&lt;td>')%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', &quot;csv_captain_phone&quot;)%]&#xa;[%if ( regexp_match( &quot;csv_captain&quot;, '^(Roger Steward|Timothy Allen)' ), '', '&lt;/td>&lt;tr>')%]&#xa;&#xa;&lt;tr>&lt;td>Timothy Allen&lt;/td>&lt;td>072 703 9574&lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}">
+        <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>
@@ -26433,53 +26721,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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" pageNameExpression="&quot;position&quot;" sortKey="position" hideCoverage="0" coverageLayerName="marshal_positions" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1" coverageLayerProvider="ogr" enabled="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortAscending="1" filterFeatures="0"/>
+      <Atlas sortFeatures="1" sortKey="position" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerName="marshal_positions" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="0" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" filterFeatures="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan" units="mm" printResolution="120">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -26494,49 +26782,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,420,mm" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,420,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{b7b60575-1082-47a2-887f-9e62272e9c18}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -26551,9 +26839,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>
@@ -26561,15 +26849,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem excludeFromExports="0" symbolHeight="4" type="65642" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" boxSpace="2" positionLock="true" equalColumnWidth="1" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="7" columnSpace="2" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="15.6525,12.5708,mm" frame="false" zValue="8" opacity="1" splitLayer="0" outlineWidthM="0.3,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="15.6525,12.5708,mm" id="" groupUuid="" rasterBorderWidth="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="miter" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" size="21.6797,27,mm" lineSpacing="1">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="false" wmsLegendWidth="50" positionOnPage="15.6525,12.5708,mm" itemRotation="0" zValue="8" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="15.6525,12.5708,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="21.6797,33,mm" positionLock="true" frameJoinStyle="miter" background="true" map_uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{cc1822dc-d522-4090-8b82-462f3ab20c72}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -26577,35 +26865,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="1" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" alignment="1" marginLeft="2" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <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="expandedLegendNodes" type="invalid"/>
+                  <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>
@@ -26613,47 +26903,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="45.1194,7.36972,mm" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="MARSHAL POSITIONS" frame="false" visibility="1" halign="1" zValue="7" positionOnPage="5.69321,399.106,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="5.69321,399.106,mm" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="45.1194,7.36972,mm" referencePoint="0" labelText="MARSHAL POSITIONS" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,399.106,mm" frame="false" marginY="1" uuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,399.106,mm" templateUuid="{f95810a1-9280-43d6-a9d6-8e876e0820a5}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -26668,65 +26958,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="16.2476,7.80192,mm" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Page [% &quot;page&quot; %]" frame="false" visibility="1" halign="1" zValue="6" positionOnPage="5.69321,406.988,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="5.69321,406.988,mm" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="16.2476,7.80192,mm" referencePoint="0" labelText="Page [% &quot;page&quot; %]" htmlState="0" zValue="6" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,406.988,mm" frame="false" marginY="1" uuid="{619c5aac-2a47-4730-9726-57b172205ef7}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,406.988,mm" templateUuid="{619c5aac-2a47-4730-9726-57b172205ef7}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -26741,65 +27031,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="27.7839,7.51682,mm" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.2" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="214.292,406.988,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="214.292,406.988,mm" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="27.7839,7.51682,mm" referencePoint="0" labelText="REVISION 1.2" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="214.292,406.988,mm" frame="false" marginY="1" uuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="214.292,406.988,mm" templateUuid="{438dba9c-f0ec-4cf5-82e0-bfe66ccffcd5}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -26814,65 +27104,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="56.3557,7.36902,mm" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 October 2019" frame="false" visibility="1" halign="2" zValue="4" positionOnPage="185.72,399.107,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="185.72,399.107,mm" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="56.3557,7.36902,mm" referencePoint="0" labelText="Sunday, 20 October 2019" htmlState="0" zValue="4" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="185.72,399.107,mm" frame="false" marginY="1" uuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="185.72,399.107,mm" templateUuid="{cbe089e5-5025-4deb-b29c-662e85b97b38}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -26887,39 +27177,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="" frameJoinStyle="miter" size="49.3143,31.2967,mm" svgBorderColor="0,0,0,255" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" groupUuid="" pictureWidth="49.3143" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="8" positionLock="true" frame="false" pictureHeight="28.8527" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="3" positionOnPage="243.319,382.696,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="243.319,382.696,mm" northMode="0" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="49.3143,31.2967,mm" referencePoint="0" zValue="3" anchorPoint="8" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="243.319,382.696,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="28.8527" groupUuid="" pictureWidth="49.3143" northMode="0" position="243.319,382.696,mm" templateUuid="{55b7115d-473e-4f6b-a6c2-438aba4a6eb5}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -26927,42 +27217,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="236.083,0.14328,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="2" positionOnPage="5.84321,406.626,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="5.84321,406.626,mm" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="236.083,0.14328,mm" referencePoint="0" zValue="2" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="5.84321,406.626,mm" frame="false" uuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.84321,406.626,mm" templateUuid="{5bbd8c6a-7510-496a-868a-4706b045a7d3}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -26977,90 +27267,90 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="286.94,392.396,mm" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="5.03,5.9483,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="5.03,5.9483,mm" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" excludeFromExports="0" followPresetName="Marshal overview">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="286.94,392.396,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.03,5.9483,mm" frame="false" mapRotation="0" uuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.03,5.9483,mm" templateUuid="{d689543f-6d0c-46cc-b00f-1b0861a29f88}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal overview" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 xmax="18.38613924055453452" ymin="-33.94797288016832226" xmin="18.36924763341120581" ymax="-33.9248732774534929"/>
+        <Extent ymin="-33.91857233280978789" xmax="18.42124635930919041" ymax="-33.89547273009495854" xmin="18.4043547521658617"/>
         <LayerSet/>
         <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" pageNameExpression="&quot;page&quot;" sortKey="page" hideCoverage="1" coverageLayerName="marshal_overviews" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayerProvider="ogr" enabled="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortAscending="1" filterFeatures="0"/>
+      <Atlas sortFeatures="1" sortKey="page" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Start &amp; Finish Backgrounds" units="mm" printResolution="300">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Start &amp; Finish Backgrounds" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -27075,49 +27365,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -27132,9 +27422,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>
@@ -27142,21 +27432,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frameJoinStyle="miter" size="9.45865,11,mm" svgBorderColor="0,0,0,255" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" groupUuid="" pictureWidth="6.31767" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="0" positionLock="true" frame="false" pictureHeight="7.97477" svgFillColor="255,255,255,255" pictureRotation="330" visibility="1" file="arrows/NorthArrow_11.svg" northOffset="0" mode="0" zValue="4" positionOnPage="286.027,2,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="286.027,2,mm" northMode="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="9.45865,11,mm" referencePoint="0" zValue="4" anchorPoint="0" pictureRotation="330" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="286.027,2,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="7.97477" groupUuid="" pictureWidth="6.31767" northMode="0" position="286.027,2,mm" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" resizeMode="0" positionLock="true" id="" opacity="1" file="arrows/NorthArrow_11.svg" outlineWidthM="0.3,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" mode="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -27164,47 +27454,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="142.543,10.3185,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" marginX="1" groupUuid="" valign="64" itemRotation="270" id="" blendMode="0" positionLock="true" labelText="[%upper( &quot;area&quot; )%]" frame="false" visibility="1" halign="1" zValue="3" positionOnPage="285.027,205.886,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="285.027,205.886,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="142.543,10.3185,mm" referencePoint="0" labelText="[%upper( &quot;area&quot; )%]" htmlState="0" zValue="3" itemRotation="270" background="false" halign="1" type="65641" blendMode="0" positionOnPage="285.027,205.886,mm" frame="false" marginY="1" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="285.027,205.886,mm" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -27219,65 +27509,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 excludeFromExports="0" segmentMillimeters="26.3519" type="65646" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" lineCapStyle="square" subdivisionsHeight="1.5" positionLock="true" lineJoinStyle="miter" background="false" unitLabel="m" outlineWidth="0.3" labelVerticalPlacement="0" style="Single Box" blendMode="0" boxContentSpace="1" unitType="meters" visibility="1" labelHorizontalPlacement="0" numSubdivisions="1" maxBarWidth="150" labelBarSpace="3" positionOnPage="7,189.669,mm" numSegmentsLeft="2" frame="false" numUnitsPerSegment="100" minBarWidth="50" zValue="2" opacity="1" outlineWidthM="0.3,mm" itemRotation="0" alignment="0" position="7,189.669,mm" id="" groupUuid="" numSegments="4" numMapUnitsPerScaleBarUnit="1" referencePoint="0" frameJoinStyle="miter" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" segmentSizeMode="1" size="145.54,16.2165,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" height="3">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" segmentSizeMode="1" numMapUnitsPerScaleBarUnit="1" labelVerticalPlacement="0" id="" outlineWidthM="0.3,mm" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" lineJoinStyle="miter" referencePoint="0" frame="false" numSegments="4" labelHorizontalPlacement="0" maxBarWidth="150" height="3" positionOnPage="7,189.669,mm" itemRotation="0" zValue="2" excludeFromExports="0" blendMode="0" groupUuid="" segmentMillimeters="26.3519" labelBarSpace="3" position="7,189.669,mm" style="Single Box" opacity="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" minBarWidth="50" lineCapStyle="square" subdivisionsHeight="1.5" unitType="meters" type="65646" boxContentSpace="1" numSubdivisions="1" size="145.54,16.2165,mm" positionLock="true" frameJoinStyle="miter" background="false" unitLabel="m" outlineWidth="0.3" visibility="1" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" alignment="0" numUnitsPerSegment="100">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -27292,75 +27582,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 red="0" green="0" alpha="255" blue="0"/>
+        <strokeColor blue="0" green="0" red="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 red="0" green="0" alpha="255" blue="0"/>
-        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
         <lineSymbol>
-          <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -27391,52 +27681,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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -27467,52 +27757,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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -27543,36 +27833,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -27587,36 +27877,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -27631,87 +27921,87 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="278.027,180.318,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" itemRotation="0" mapRotation="330" id="" blendMode="0" isTemporal="0" positionLock="true" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="7,5.5,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="false" followPreset="true" position="7,5.5,mm" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" followPresetName="Start/Finish">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="278.027,180.318,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="false" followPreset="true" type="65639" blendMode="0" positionOnPage="7,5.5,mm" frame="false" mapRotation="330" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="7,5.5,mm" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Start/Finish" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41790915398017958" ymin="-33.90494830469008747" xmin="18.40843143571575169" ymax="-33.89880140828828559"/>
+        <Extent ymin="-33.90494830469008747" xmax="18.41790915398017958" ymax="-33.89880140828828559" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="3" gridStyle="0" rightAnnotationDisplay="3" minimumIntervalWidth="50" intervalY="5" gridFramePenThickness="0.5" intervalX="5" unit="1" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="4" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="3">
+        <ComposerMapGrid offsetY="0" intervalY="5" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="4" crossLength="3" rotatedTicksLengthMode="0" unit="1" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" rotatedTicksMarginToCorner="0" intervalX="5" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="3" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="3" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -27742,44 +28032,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -27802,9 +28092,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>
@@ -27821,32 +28111,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -27861,29 +28151,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -27893,63 +28183,63 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.05" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" pageNameExpression="&quot;area&quot;" sortKey="area" hideCoverage="1" coverageLayerName="start_finish_area" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayerProvider="ogr" enabled="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortAscending="1" filterFeatures="0"/>
+      <Atlas sortFeatures="1" sortKey="area" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerName="start_finish_area" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Fencing" units="mm" printResolution="300">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Fencing" printResolution="300" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -27964,49 +28254,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -28021,9 +28311,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>
@@ -28031,47 +28321,47 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="148.46,7.36972,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="FENCING: [% &quot;name&quot; %]" frame="false" visibility="1" halign="1" zValue="11" positionOnPage="6.76779,190.27,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="6.76779,190.27,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="148.46,7.36972,mm" referencePoint="0" labelText="FENCING: [% &quot;name&quot; %]" htmlState="0" zValue="11" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="6.76779,190.27,mm" frame="false" marginY="1" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="6.76779,190.27,mm" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28086,65 +28376,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="27.7839,7.51682,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.0" frame="false" visibility="1" halign="2" zValue="10" positionOnPage="211.295,197.64,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="211.295,197.64,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="27.7839,7.51682,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="10" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="211.295,197.64,mm" frame="false" marginY="1" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="211.295,197.64,mm" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28159,65 +28449,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="67.0856,7.80192,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" frame="false" visibility="1" halign="1" zValue="9" positionOnPage="115.637,198.083,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="115.637,198.083,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="67.0856,7.80192,mm" referencePoint="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" htmlState="0" zValue="9" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="115.637,198.083,mm" frame="false" marginY="1" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="115.637,198.083,mm" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28232,65 +28522,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="53.0017,7.80192,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="59.5581,198.083,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="59.5581,198.083,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="53.0017,7.80192,mm" referencePoint="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" htmlState="0" zValue="8" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="59.5581,198.083,mm" frame="false" marginY="1" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="59.5581,198.083,mm" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28305,65 +28595,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="52.7903,7.80192,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Page [% @atlas_featurenumber %]" frame="false" visibility="1" halign="1" zValue="7" positionOnPage="6.76779,198.083,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="6.76779,198.083,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="52.7903,7.80192,mm" referencePoint="0" labelText="Page [% @atlas_featurenumber %]" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="6.76779,198.083,mm" frame="false" marginY="1" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="6.76779,198.083,mm" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28378,39 +28668,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="" frameJoinStyle="miter" size="49.3143,29.8354,mm" svgBorderColor="0,0,0,255" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" groupUuid="" pictureWidth="49.3143" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="8" positionLock="true" frame="false" pictureHeight="28.8527" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="6" positionOnPage="243.098,175.353,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="243.098,175.353,mm" northMode="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="49.3143,29.8354,mm" referencePoint="0" zValue="6" anchorPoint="8" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="243.098,175.353,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="28.8527" groupUuid="" pictureWidth="49.3143" northMode="0" position="243.098,175.353,mm" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -28418,47 +28708,47 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="56.3557,7.36902,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 September 2020" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="182.723,190.271,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="182.723,190.271,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="56.3557,7.36902,mm" referencePoint="0" labelText="Sunday, 20 September 2020" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="182.723,190.271,mm" frame="false" marginY="1" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="182.723,190.271,mm" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28473,60 +28763,60 @@ 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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="232.01,0.14328,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="4" positionOnPage="6.91779,197.79,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="6.91779,197.79,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="232.01,0.14328,mm" referencePoint="0" zValue="4" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="6.91779,197.79,mm" frame="false" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="6.91779,197.79,mm" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -28541,55 +28831,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 excludeFromExports="0" segmentMillimeters="28.4264" type="65646" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" lineCapStyle="square" subdivisionsHeight="1.5" positionLock="true" lineJoinStyle="round" background="false" unitLabel="m" outlineWidth="0.2" labelVerticalPlacement="0" style="Double Box" blendMode="0" boxContentSpace="0.2" unitType="meters" visibility="1" labelHorizontalPlacement="0" numSubdivisions="1" maxBarWidth="100" labelBarSpace="1" positionOnPage="6.76779,2.8482,mm" numSegmentsLeft="2" frame="false" numUnitsPerSegment="10" minBarWidth="25" zValue="3" opacity="1" outlineWidthM="0.3,mm" itemRotation="0" alignment="0" position="6.76779,2.8482,mm" id="" groupUuid="" numSegments="2" numMapUnitsPerScaleBarUnit="1" referencePoint="0" frameJoinStyle="miter" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" segmentSizeMode="1" size="95.0404,15.8378,mm" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" height="2">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem numSegmentsLeft="2" segmentSizeMode="1" numMapUnitsPerScaleBarUnit="1" labelVerticalPlacement="0" id="" outlineWidthM="0.3,mm" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" lineJoinStyle="round" referencePoint="0" frame="false" numSegments="2" labelHorizontalPlacement="0" maxBarWidth="100" height="2" positionOnPage="6.76779,2.8482,mm" itemRotation="0" zValue="3" excludeFromExports="0" blendMode="0" groupUuid="" segmentMillimeters="28.4264" labelBarSpace="1" position="6.76779,2.8482,mm" style="Double Box" opacity="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" minBarWidth="25" lineCapStyle="square" subdivisionsHeight="1.5" unitType="meters" type="65646" boxContentSpace="0.2" numSubdivisions="1" size="95.0404,15.8378,mm" positionLock="true" frameJoinStyle="miter" background="false" unitLabel="m" outlineWidth="0.2" visibility="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" alignment="0" numUnitsPerSegment="10">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="0" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -28604,75 +28894,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 red="0" green="0" alpha="255" blue="0"/>
+        <strokeColor blue="0" green="0" red="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 red="0" green="0" alpha="255" blue="0"/>
-        <fillColor2 red="255" green="255" alpha="255" blue="255"/>
+        <fillColor blue="0" green="0" red="0" alpha="255"/>
+        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
         <lineSymbol>
-          <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -28703,52 +28993,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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -28779,52 +29069,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 name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <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">
               <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"/>
@@ -28855,36 +29145,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -28899,36 +29189,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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -28943,24 +29233,24 @@ 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 excludeFromExports="0" symbolHeight="4" type="65642" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" boxSpace="2" positionLock="true" equalColumnWidth="1" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="7" columnSpace="2" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="256.808,2.9982,mm" frame="true" zValue="2" opacity="1" splitLayer="0" outlineWidthM="0.3,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="256.808,2.9982,mm" id="" groupUuid="" rasterBorderWidth="0" maxSymbolSize="0" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="miter" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" size="38.1563,54.9504,mm" lineSpacing="1">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="true" wmsLegendWidth="50" positionOnPage="256.808,2.9982,mm" itemRotation="0" zValue="2" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="256.808,2.9982,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="38.1563,54.9504,mm" positionLock="true" frameJoinStyle="miter" background="true" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" rasterBorder="1" resizeToContents="0" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -28968,52 +29258,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="Bold" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" italic="0" bold="1" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" style="Bold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="3" name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="3" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2.5" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" alignment="1" marginLeft="2" indent="0">
-            <styleFont style="Regular" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0" underline="0"/>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Fencing and Cones" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./fencing.shp|layername=fencing">
               <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" 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" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <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>
@@ -29021,44 +29311,44 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="283.418,180.92,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="6.76779,9.35102,mm" mapFlags="0" referencePoint="0" opacity="0.9" type="65639" background="false" followPreset="true" position="6.76779,9.35102,mm" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" excludeFromExports="0" followPresetName="Fencing">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="283.418,180.92,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="false" followPreset="true" type="65639" blendMode="0" positionOnPage="6.76779,9.35102,mm" frame="false" mapRotation="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="6.76779,9.35102,mm" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" positionLock="true" id="" opacity="0.9" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Fencing" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.4172496509604926" ymin="-33.90421228789515595" xmin="18.41635400827248503" ymax="-33.90364055490629625"/>
+        <Extent ymin="-33.90421228789515595" xmax="18.4172496509604926" ymax="-33.90364055490629625" xmin="18.41635400827248503"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -29073,45 +29363,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="3" gridStyle="0" rightAnnotationDisplay="3" minimumIntervalWidth="50" intervalY="5" gridFramePenThickness="0.5" intervalX="5" unit="1" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="4" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="3" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="3">
+        <ComposerMapGrid offsetY="0" intervalY="5" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="4" crossLength="3" rotatedTicksLengthMode="0" unit="1" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="3" rotatedTicksMarginToCorner="0" intervalX="5" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="3" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="3" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -29142,44 +29432,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -29202,9 +29492,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>
@@ -29221,32 +29511,32 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -29261,29 +29551,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -29293,60 +29583,60 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.40000000000000002" scalingMode="2" atlasDriven="1"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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="1" name="pdfAppendGeoreference" type="QString"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="QString"/>
-          <Option value="1" name="pdfSimplify" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="rasterize" 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="pdfAppendGeoreference" value="1" type="QString"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="QString"/>
+          <Option name="pdfSimplify" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="rasterize" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" pageNameExpression="&quot;name&quot;" sortKey="group" hideCoverage="1" coverageLayerName="fence_groups" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayerProvider="virtual" enabled="1" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" sortAscending="1" filterFeatures="0"/>
+      <Atlas sortFeatures="1" sortKey="group" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayerName="fence_groups" coverageLayerProvider="virtual" sortAscending="1" hideCoverage="1" coverageLayer="fence_groups_cbaea960_3348_4aea_b155_46e5d310f792" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" name="Ask Me" units="mm" printResolution="144">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="9" offsetUnits="mm"/>
+    <Layout units="mm" name="Ask Me" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="9" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -29361,49 +29651,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -29418,59 +29708,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" position="0" page="0" units="mm"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="83.9998,10.4638,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="false" labelText="Directions to Start of Race" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="4.43449,186.634,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="4.43449,186.634,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="83.9998,10.4638,mm" referencePoint="0" labelText="Directions to Start of Race" htmlState="0" zValue="8" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="4.43449,186.634,mm" frame="false" marginY="1" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="4.43449,186.634,mm" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="14" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -29485,65 +29775,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="48.2923,9.511,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="false" labelText="Gun Run" frame="false" visibility="1" halign="1" zValue="7" positionOnPage="4.43449,197.498,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="4.43449,197.498,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="48.2923,9.511,mm" referencePoint="0" labelText="Gun Run" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="4.43449,197.498,mm" frame="false" marginY="1" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="4.43449,197.498,mm" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -29558,33 +29848,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 excludeFromExports="0" symbolHeight="5" type="65642" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" boxSpace="2" positionLock="false" equalColumnWidth="0" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="9" columnSpace="0" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="10.096,10.8563,mm" frame="true" zValue="6" opacity="1" splitLayer="0" outlineWidthM="0.3,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="10.096,10.8563,mm" id="" groupUuid="" rasterBorderWidth="0" legendFilterByMap="1" maxSymbolSize="0" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="round" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" size="59.0766,76,mm" lineSpacing="2">
-        <FrameColor red="139" green="139" alpha="255" blue="139"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="9" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolHeight="5" referencePoint="0" lineSpacing="2" frame="true" wmsLegendWidth="50" positionOnPage="10.096,10.8563,mm" itemRotation="0" zValue="6" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="0" position="10.096,10.8563,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="0" columnCount="1" size="59.0766,76,mm" positionLock="false" frameJoinStyle="round" background="true" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" legendFilterByMap="1" rasterBorderWidth="0">
+        <FrameColor blue="139" green="139" red="139" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -29592,52 +29882,52 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2.5" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2.5" alignment="1" marginLeft="3" indent="0">
-            <styleFont style="Regular" strikethrough="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0" underline="0"/>
+          <style marginTop="2.5" marginLeft="3" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Ask Me" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Ask Me" groupLayer="" checked="Qt::Checked">
             <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 legend_exp="" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_split_behavior="0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="poi_labels" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./poi_labels.shp|layername=poi_labels">
               <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 legend_exp="" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_split_behavior="0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="directions_to_start" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./directions_to_start.shp|layername=directions_to_start">
               <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>
@@ -29645,47 +29935,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="27.7839,6.871,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="false" labelText="REVISION 1.0" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="221.862,190.027,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="221.862,190.027,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="27.7839,6.871,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="221.862,190.027,mm" frame="false" marginY="1" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="221.862,190.027,mm" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -29700,65 +29990,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="51.6706,6.60801,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="false" labelText="Sunday, 20 October 2019" frame="false" visibility="1" halign="2" zValue="4" positionOnPage="197.975,197.498,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="197.975,197.498,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" referencePoint="0" labelText="Sunday, 20 October 2019" htmlState="0" zValue="4" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="197.975,197.498,mm" frame="false" marginY="1" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="197.975,197.498,mm" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -29773,39 +30063,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frameJoinStyle="miter" size="42.9838,24.3824,mm" svgBorderColor="0,0,0,255" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" groupUuid="" pictureWidth="41.6737" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="4" positionLock="false" frame="false" pictureHeight="24.3824" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="3" positionOnPage="249.646,179.724,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="249.646,179.724,mm" northMode="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="42.9838,24.3824,mm" referencePoint="0" zValue="3" anchorPoint="4" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="249.646,179.724,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="24.3824" groupUuid="" pictureWidth="41.6737" northMode="0" position="249.646,179.724,mm" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" resizeMode="0" positionLock="false" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -29813,42 +30103,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="244.912,0.1,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="2" positionOnPage="4.58449,197.248,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="4.58449,197.248,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="244.912,0.1,mm" referencePoint="0" zValue="2" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="4.58449,197.248,mm" frame="false" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="4.58449,197.248,mm" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -29863,46 +30153,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>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="288.007,183.616,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="false" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="4.43449,6.411,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="4.43449,6.411,mm" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" followPresetName="Ask Me">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="288.007,183.616,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="4.43449,6.411,mm" frame="false" mapRotation="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="4.43449,6.411,mm" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Ask Me" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41789384089274151" ymin="-33.90994364588821952" xmin="18.39762336729721071" ymax="-33.8970204297764468"/>
+        <Extent ymin="-33.90994364588821952" xmax="18.41789384089274151" ymax="-33.8970204297764468" xmin="18.39762336729721071"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -29917,45 +30207,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -29986,44 +30276,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -30046,40 +30336,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -30094,29 +30384,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -30126,54 +30416,54 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 pageNameExpression="" hideCoverage="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0" enabled="0" coverageLayer="" filterFeatures="0"/>
+      <Atlas sortFeatures="0" hideCoverage="0" coverageLayer="" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" enabled="0"/>
     </Layout>
-    <Layout worldFileMap="" name="All Routes" units="mm" printResolution="144">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="All Routes" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -30188,49 +30478,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -30245,59 +30535,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" position="0" page="0" units="mm"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="61.5373,6.60801,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Gun Run 2022: [%&quot;Source&quot;%]" frame="false" visibility="1" halign="1" zValue="10" positionOnPage="9.7863,192.073,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="9.7863,192.073,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="61.5373,6.8714,mm" referencePoint="0" labelText="REVISION 2.3" htmlState="0" zValue="13" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="200.171,199.082,mm" frame="false" marginY="1" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="200.171,199.082,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -30312,65 +30602,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="61.5373,6.8714,mm" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 2.0" frame="false" visibility="1" halign="2" zValue="9" positionOnPage="200.171,199.082,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="200.171,199.082,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="61.5373,6.60801,mm" referencePoint="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" htmlState="0" zValue="12" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="9.7863,192.073,mm" frame="false" marginY="1" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.7863,192.073,mm" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -30385,65 +30675,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="61.5373,6.60801,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="9.7863,199.082,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="9.7863,199.082,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="61.5373,6.60801,mm" referencePoint="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" htmlState="0" zValue="11" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="9.7863,199.082,mm" frame="false" marginY="1" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.7863,199.082,mm" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -30458,39 +30748,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" frameJoinStyle="miter" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" groupUuid="" pictureWidth="29.7523" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="4" positionLock="true" frame="false" pictureHeight="17.4074" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="7" positionOnPage="262.196,188.218,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="262.196,188.218,mm" northMode="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" referencePoint="0" zValue="10" anchorPoint="4" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="262.196,188.218,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="17.4074" groupUuid="" pictureWidth="29.7523" northMode="0" position="262.196,188.218,mm" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -30498,42 +30788,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="251.982,0.1,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="6" positionOnPage="9.57644,198.832,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="9.57644,198.832,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="251.982,0.1,mm" referencePoint="0" zValue="9" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="9.57644,198.832,mm" frame="false" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.57644,198.832,mm" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -30548,171 +30838,321 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="67.7828,166.874,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" groupUuid="" itemRotation="0" mapRotation="0" id="Left inset" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="5" positionOnPage="5.86559,4.09761,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="false" position="5.86559,4.09761,mm" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" excludeFromExports="0" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="107.861,186.385,mm" referencePoint="0" isTemporal="0" zValue="8" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="9.57644,5.42566,mm" frame="true" mapRotation="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.57644,5.42566,mm" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" positionLock="true" id="Trail Finish" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
-                <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>
-                <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>
-                <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>
-                <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>
                 <Option name="dataDefinedOpacity" 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;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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38626092146919788" ymin="-33.94700000000000273" xmin="18.37399999999999878" ymax="-33.91681492292400435"/>
+        <Extent ymin="-33.93243205975926458" xmax="18.41187375074135701" ymax="-33.90007566747966905" xmin="18.39314911415855391"/>
+        <LayerSet/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <LayoutItem size="179.156,189.279,mm" referencePoint="0" isTemporal="0" zValue="7" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="112.643,4.09761,mm" frame="true" mapRotation="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="112.643,4.09761,mm" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" positionLock="true" id="Trail Start" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <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 name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.95772328900195447" xmax="18.42354248737832023" ymax="-33.92484901666441743" xmin="18.3924263991010406"/>
+        <LayerSet/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <LayoutItem size="67.7828,166.874,mm" referencePoint="0" isTemporal="0" zValue="6" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.86559,4.09761,mm" frame="true" mapRotation="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" positionLock="true" id="Left inset 21KM" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <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 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 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 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 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 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 name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.94700000000000273" xmax="18.38626092146919788" ymax="-33.91681492292400435" xmin="18.37399999999999878"/>
         <LayerSet/>
         <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="113.3,76.1023,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" groupUuid="" itemRotation="0" mapRotation="0" id="Bottom inset" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="true" labelMargin="0,mm" zValue="4" positionOnPage="126.141,118.975,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="false" position="126.141,118.975,mm" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" excludeFromExports="0" followPresetName="">
-        <FrameColor red="103" green="34" alpha="255" blue="144"/>
-        <BackgroundColor red="200" green="175" alpha="255" blue="215"/>
+      <LayoutItem size="113.3,76.1023,mm" referencePoint="0" isTemporal="0" zValue="5" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="126.141,118.975,mm" frame="true" mapRotation="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="126.141,118.975,mm" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" positionLock="true" id="Bottom inset 21KM" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="144" green="34" red="103" alpha="255"/>
+        <BackgroundColor blue="215" green="175" red="200" 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;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;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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42329132157224336" ymin="-33.9168317482614512" xmin="18.41509620662891678" ymax="-33.91132718340826813"/>
+        <Extent ymin="-33.9168317482614512" xmax="18.42329132157224336" ymax="-33.91132718340826813" xmin="18.41509620662891678"/>
         <LayerSet/>
         <AtlasMap margin="0.10000000000000001" scalingMode="0" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="1">
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" frameJoinStyle="round" size="282.372,186.234,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" groupUuid="" itemRotation="0" mapRotation="0" id="Main Map" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="true" labelMargin="0,mm" zValue="1" positionOnPage="9.50144,5.50066,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="9.50144,5.50066,mm" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" excludeFromExports="0" followPresetName="Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="68.3676,117.12,mm" referencePoint="0" isTemporal="0" zValue="4" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="19.6693,7.89412,mm" frame="true" mapRotation="0" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" visibility="0" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="19.6693,7.89412,mm" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" positionLock="true" id="End inset Trail" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
-                <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.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3985'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" 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.920'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                <Option name="dataDefinedOpacity" type="Map">
+                  <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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.45388997967945599" ymin="-33.95900000000000318" xmin="18.36400000000000077" ymax="-33.89971434483344126"/>
+        <Extent ymin="-33.91454383501641701" xmax="18.41240136424316276" ymax="-33.90099106513847005" xmin="18.4044900556177744"/>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <LayoutItem size="63.655,88.3012,mm" referencePoint="0" isTemporal="0" zValue="3" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="170.062,49.6297,mm" frame="true" mapRotation="0" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" visibility="0" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="170.062,49.6297,mm" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" positionLock="true" id="Start inset Trail" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <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 name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.94823764719958348" xmax="18.4185691326545431" ymax="-33.94253141264477591" xmin="18.41445559427620893"/>
+        <LayerSet/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <LayoutItem size="75.8756,69.7635,mm" referencePoint="0" isTemporal="0" zValue="2" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="200.321,125.314,mm" frame="true" mapRotation="0" uuid="{917a530c-14f4-4ed8-b109-961939435221}" visibility="0" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="200.321,125.314,mm" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" positionLock="true" id="Contour inset Trail" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedOpacity" type="Map">
+                  <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 name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.95702588572736147" xmax="18.42332635419156972" ymax="-33.94692690566557047" xmin="18.41234259163472942"/>
+        <LayerSet/>
+        <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="1" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="1" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <LayoutItem size="282.372,186.234,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="9.50144,5.50066,mm" frame="true" mapRotation="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" visibility="1" excludeFromExports="0" frameJoinStyle="round" groupUuid="" position="9.50144,5.50066,mm" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" positionLock="true" id="Main Map" opacity="1" outlineWidthM="0.15,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="true" followPresetName="Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <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 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.381'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '18.3985'&#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 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.920'&#xa;WHEN &quot;Source&quot; = '5KM'  THEN '-33.910'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '-33.959'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
+                </Option>
+              </Option>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.92600000000000193" xmax="18.42305800376168179" ymax="-33.89232542119508196" xmin="18.37199999999999989"/>
+        <LayerSet/>
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -30743,44 +31183,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -30803,40 +31243,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -30851,29 +31291,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -30881,34 +31321,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview name="Overview 1" position="3" blendMode="0" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" centered="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" inverted="0">
-          <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <ComposerMapOverview position="3" centered="0" show="1" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" inverted="0" blendMode="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <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">
               <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"/>
@@ -30923,9 +31363,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>
@@ -30933,9 +31373,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>
@@ -30945,61 +31385,61 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_480a16f1_f33c_4e25_9096_b5fc18d660d8" 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~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1" 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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" pageNameExpression="&quot;Distance&quot;" sortKey="&quot;Sort&quot;" hideCoverage="0" coverageLayerName="all_routes" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" coverageLayerProvider="ogr" enabled="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortAscending="1" filterFeatures="1"/>
+      <Atlas sortFeatures="1" sortKey="&quot;Sort&quot;" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerName="all_routes" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="0" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" filterFeatures="1" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Marshal Plan A1" units="mm" printResolution="120">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Marshal Plan A1" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -31014,49 +31454,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="594,841,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="594,841,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -31071,9 +31511,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>
@@ -31081,15 +31521,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem excludeFromExports="0" symbolHeight="4" type="65642" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" boxSpace="2" positionLock="true" equalColumnWidth="1" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="7" columnSpace="2" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="25.5925,18.7971,mm" frame="false" zValue="8" opacity="1" splitLayer="0" outlineWidthM="0.3,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="25.5925,18.7971,mm" id="" groupUuid="" rasterBorderWidth="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="miter" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" size="18.6109,9,mm" lineSpacing="1">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="false" wmsLegendWidth="50" positionOnPage="25.5925,18.7971,mm" itemRotation="0" zValue="8" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="25.5925,18.7971,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="4,4,mm" positionLock="true" frameJoinStyle="miter" background="true" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -31097,37 +31537,37 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="1" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="1" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" alignment="1" marginLeft="2" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="all_routes" id="all_routes20170907054841602" patch_size="0,0" legend_split_behavior="0" checked="Qt::Checked" expanded="1">
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes20170907054841602" patch_size="0,0" legend_split_behavior="0" checked="Qt::Checked" legend_exp="">
               <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>
@@ -31135,47 +31575,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="91.9494,15.0649,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="MARSHAL POSITIONS" frame="false" visibility="1" halign="1" zValue="7" positionOnPage="5.2963,808.939,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="5.2963,808.939,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="91.9494,15.0649,mm" referencePoint="0" labelText="MARSHAL POSITIONS" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.2963,808.939,mm" frame="false" marginY="1" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.2963,808.939,mm" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31190,65 +31630,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="56.6212,15.3656,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" marginX="1" groupUuid="" valign="32" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.2" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="430.403,825.052,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="430.403,825.052,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="56.6212,15.3656,mm" referencePoint="0" labelText="REVISION 1.2" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="430.403,825.052,mm" frame="false" marginY="1" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="430.403,825.052,mm" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31263,65 +31703,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="114.848,15.0635,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 October 2019" frame="false" visibility="1" halign="2" zValue="4" positionOnPage="372.175,808.942,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="372.175,808.942,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="114.848,15.0635,mm" referencePoint="0" labelText="Sunday, 20 October 2019" htmlState="0" zValue="4" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="372.175,808.942,mm" frame="false" marginY="1" uuid="{d177957c-7ab6-40ae-8769-347428500538}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="372.175,808.942,mm" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31336,39 +31776,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="" frameJoinStyle="miter" size="100.498,63.9757,mm" svgBorderColor="0,0,0,255" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" groupUuid="" pictureWidth="100.498" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="8" positionLock="true" frame="false" pictureHeight="58.7992" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="3" positionOnPage="489.557,775.395,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="489.557,775.395,mm" northMode="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="100.498,63.9757,mm" referencePoint="0" zValue="3" anchorPoint="8" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="489.557,775.395,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="58.7992" groupUuid="" pictureWidth="100.498" northMode="0" position="489.557,775.395,mm" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -31376,42 +31816,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="481.428,0.606138,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="2" positionOnPage="5.4463,824.155,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="5.4463,824.155,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="481.428,0.606138,mm" referencePoint="0" zValue="2" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="5.4463,824.155,mm" frame="false" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.4463,824.155,mm" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -31426,90 +31866,90 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="584.759,811.213,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="3.94474,5.25965,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="3.94474,5.25965,mm" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" excludeFromExports="0" followPresetName="Marshal overview">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="584.759,811.213,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="3.94474,5.25965,mm" frame="true" mapRotation="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="3.94474,5.25965,mm" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal overview" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 xmax="18.42299397558693741" ymin="-33.95821655848814657" xmin="18.37434415142052657" ymax="-33.89072661913806428"/>
+        <Extent ymin="-33.95821655848814657" xmax="18.42299397558693741" ymax="-33.89072661913806428" xmin="18.37434415142052657"/>
         <LayerSet/>
         <AtlasMap margin="0" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" pageNameExpression="&quot;page&quot;" sortKey="page" hideCoverage="1" coverageLayerName="complete_marshal_overview" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" coverageLayerProvider="virtual" enabled="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortAscending="1" filterFeatures="0"/>
+      <Atlas sortFeatures="1" sortKey="page" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" sortAscending="1" hideCoverage="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="" name="Access Roads" units="mm" printResolution="144">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Access Roads" printResolution="144" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -31524,49 +31964,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -31581,27 +32021,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" position="0" page="0" units="mm"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem excludeFromExports="0" symbolHeight="4" type="65642" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" boxSpace="2" positionLock="true" equalColumnWidth="0" background="true" titleAlignment="1" rasterBorderColor="0,0,0,255" minSymbolSize="0" symbolWidth="7" columnSpace="2" blendMode="0" rasterBorder="1" wrapChar="" visibility="1" positionOnPage="244.484,130.172,mm" frame="true" zValue="15" opacity="1" splitLayer="0" outlineWidthM="0.3,mm" itemRotation="0" fontColor="#000000" title="" symbolAlignment="1" position="244.484,130.172,mm" id="" groupUuid="" rasterBorderWidth="0" maxSymbolSize="0" resizeToContents="1" wmsLegendWidth="50" legendFilterByAtlas="0" columnCount="1" referencePoint="0" wmsLegendHeight="25" frameJoinStyle="miter" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" size="34.45,40.8,mm" lineSpacing="1">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="185" blue="255"/>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="true" wmsLegendWidth="50" positionOnPage="244.484,130.172,mm" itemRotation="0" zValue="15" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="244.484,130.172,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="0" columnCount="1" size="34.45,40.8,mm" positionLock="true" frameJoinStyle="miter" background="true" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -31609,35 +32049,35 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="group" marginTop="3" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="3" name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="subgroup" marginTop="3" alignment="1" indent="0">
-            <styleFont style="Semibold" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1" underline="0"/>
+          <style marginTop="3" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
           </style>
-          <style name="symbol" marginTop="2.5" alignment="1" indent="0">
-            <styleFont style="" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0" underline="0"/>
+          <style marginTop="2.5" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" style=""/>
           </style>
-          <style name="symbolLabel" marginTop="2" alignment="1" marginLeft="2" indent="0">
-            <styleFont style="Regular" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0" underline="0"/>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" style="Regular"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Residents Access" checked="Qt::Checked" groupLayer="" expanded="1">
+          <layer-tree-group expanded="1" name="Residents Access" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer legend_exp="" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_split_behavior="0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" providerKey="ogr" expanded="1">
+            <layer-tree-layer expanded="1" name="residents_access_roads" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./residents_access_roads.shp|layername=residents_access_roads">
               <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>
@@ -31645,47 +32085,47 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="194.851,7.272,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" marginX="0" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="ACCESS ROUTES FOR RESIDENTS" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="9.37446,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="9.37446,191.81,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="194.851,7.272,mm" referencePoint="0" labelText="ACCESS ROUTES FOR RESIDENTS" htmlState="0" zValue="8" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="9.37446,191.81,mm" frame="false" marginY="1" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.37446,191.81,mm" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="14" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31700,65 +32140,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="57.4836,6.8714,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.1" frame="false" visibility="1" halign="2" zValue="6" positionOnPage="204.225,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="204.225,191.81,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" referencePoint="0" labelText="REVISION 1.1" htmlState="0" zValue="6" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="204.225,191.81,mm" frame="false" marginY="1" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="204.225,191.81,mm" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31773,65 +32213,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="51.6706,6.60801,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 October 2019" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="210.038,199.082,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="210.038,199.082,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" referencePoint="0" labelText="Sunday, 20 October 2019" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="210.038,199.082,mm" frame="false" marginY="1" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="210.038,199.082,mm" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -31846,39 +32286,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" frameJoinStyle="miter" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" groupUuid="" pictureWidth="29.7523" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="4" positionLock="true" frame="false" pictureHeight="17.4074" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="4" positionOnPage="262.196,188.218,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="262.196,188.218,mm" northMode="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" referencePoint="0" zValue="4" anchorPoint="4" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="262.196,188.218,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="17.4074" groupUuid="" pictureWidth="29.7523" northMode="0" position="262.196,188.218,mm" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -31886,42 +32326,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="251.959,0.1,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="3" positionOnPage="9.59946,198.832,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="9.59946,198.832,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="251.959,0.1,mm" referencePoint="0" zValue="3" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="9.59946,198.832,mm" frame="false" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.59946,198.832,mm" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -31936,61 +32376,61 @@ 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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="67.7828,166.874,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="2" positionOnPage="5.86559,4.09761,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="5.86559,4.09761,mm" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" excludeFromExports="0" followPresetName="Access Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="67.7828,166.874,mm" referencePoint="0" isTemporal="0" zValue="2" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.86559,4.09761,mm" frame="true" mapRotation="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.86559,4.09761,mm" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Access Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38563681624126289" ymin="-33.94652930000000168" xmin="18.37288570000000121" ymax="-33.91513741583252539"/>
+        <Extent ymin="-33.94652930000000168" xmax="18.38563681624126289" ymax="-33.91513741583252539" xmin="18.37288570000000121"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32005,45 +32445,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -32074,44 +32514,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -32134,40 +32574,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -32182,29 +32622,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -32214,43 +32654,43 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.05" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" frameJoinStyle="round" size="282.012,175.592,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="true" frame="true" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="9.44946,9.08557,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="true" position="9.44946,9.08557,mm" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" excludeFromExports="0" followPresetName="Access Routes">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="282.012,175.592,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="9.44946,9.08557,mm" frame="true" mapRotation="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" visibility="1" excludeFromExports="0" frameJoinStyle="round" groupUuid="" position="9.44946,9.08557,mm" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" positionLock="true" id="" opacity="1" outlineWidthM="0.15,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Access Routes" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42303507276415431" ymin="-33.92999999999999972" xmin="18.37000000000000099" ymax="-33.89697816224119009"/>
+        <Extent ymin="-33.92999999999999972" xmax="18.42303507276415431" ymax="-33.89697816224119009" xmin="18.37000000000000099"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32265,45 +32705,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -32334,44 +32774,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -32394,40 +32834,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -32442,29 +32882,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -32474,54 +32914,54 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;" hideCoverage="1" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0" coverageLayerProvider="ogr" enabled="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0"/>
+      <Atlas sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="1"/>
     </Layout>
-    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" name="Golf Course Access" units="mm" printResolution="144">
-      <Snapper tolerance="5" snapToGuides="1" snapToItems="1" snapToGrid="0"/>
-      <Grid offsetY="0" resUnits="mm" offsetX="0" resolution="10" offsetUnits="mm"/>
+    <Layout units="mm" name="Golf Course Access" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
       <PageCollection>
-        <symbol name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -32536,49 +32976,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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="297,210,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="false" frame="false" visibility="1" zValue="0" positionOnPage="0,0,mm" referencePoint="0" opacity="1" type="65638" background="true" position="0,0,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" excludeFromExports="0">
-          <FrameColor red="0" green="0" alpha="255" blue="0"/>
-          <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+        <LayoutItem size="297,210,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" 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="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"/>
@@ -32593,59 +33033,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" position="0" page="0" units="mm"/>
+          <Guide position="0" units="mm" orientation="2" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" frameJoinStyle="miter" size="194.851,7.272,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" marginX="0" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Access to P9 Parking and VIP Tent" frame="false" visibility="1" halign="1" zValue="8" positionOnPage="9.37446,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="9.37446,191.81,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="194.851,7.272,mm" referencePoint="0" labelText="Access to P9 Parking and VIP Tent" htmlState="0" zValue="8" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="9.37446,191.81,mm" frame="false" marginY="1" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.37446,191.81,mm" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="14" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="14" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -32660,65 +33100,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="57.4836,6.8714,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="REVISION 1.0" frame="false" visibility="1" halign="2" zValue="6" positionOnPage="204.225,191.81,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="204.225,191.81,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="57.4836,6.8714,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="6" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="204.225,191.81,mm" frame="false" marginY="1" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="204.225,191.81,mm" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -32733,65 +33173,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" frameJoinStyle="miter" size="51.6706,6.60801,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" marginX="1" groupUuid="" valign="64" itemRotation="0" id="" blendMode="0" positionLock="true" labelText="Sunday, 20 October 2019" frame="false" visibility="1" halign="2" zValue="5" positionOnPage="210.038,199.082,mm" referencePoint="0" opacity="1" htmlState="0" type="65641" background="false" marginY="1" position="210.038,199.082,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="51.6706,6.60801,mm" referencePoint="0" labelText="Sunday, 20 October 2019" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="210.038,199.082,mm" frame="false" marginY="1" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="210.038,199.082,mm" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="12" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
           <families/>
-          <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-          <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-          <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-            <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" 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 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"/>
@@ -32806,39 +33246,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+          <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
           <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 outlineWidthM="0.3,mm" mapUuid="" frameJoinStyle="miter" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" groupUuid="" pictureWidth="29.7523" itemRotation="0" id="" resizeMode="0" blendMode="0" anchorPoint="4" positionLock="true" frame="false" pictureHeight="17.4074" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" file="../Gun_Run_Logo.png" northOffset="0" mode="1" zValue="4" positionOnPage="262.196,188.218,mm" referencePoint="0" opacity="1" svgBorderWidth="0.2" type="65640" background="false" position="262.196,188.218,mm" northMode="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="29.7523,17.4718,mm" referencePoint="0" zValue="4" anchorPoint="4" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="262.196,188.218,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="17.4074" groupUuid="" pictureWidth="29.7523" northMode="0" position="262.196,188.218,mm" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
@@ -32846,42 +33286,42 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" shapeType="1" frameJoinStyle="miter" size="251.959,0.1,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" groupUuid="" itemRotation="0" id="" blendMode="0" positionLock="true" frame="false" visibility="1" zValue="3" positionOnPage="9.59946,198.832,mm" referencePoint="0" opacity="1" cornerRadiusMeasure="0,mm" type="65643" background="false" position="9.59946,198.832,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" excludeFromExports="0">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="251.959,0.1,mm" referencePoint="0" zValue="3" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="9.59946,198.832,mm" frame="false" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="9.59946,198.832,mm" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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 name="" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" 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="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"/>
@@ -32896,46 +33336,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>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" frameJoinStyle="round" size="282.012,182.649,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" groupUuid="" itemRotation="0" mapRotation="0" id="" blendMode="0" isTemporal="0" positionLock="false" frame="false" visibility="1" keepLayerSet="false" drawCanvasItems="false" labelMargin="0,mm" zValue="1" positionOnPage="9.44946,7.25098,mm" mapFlags="0" referencePoint="0" opacity="1" type="65639" background="true" followPreset="false" position="9.44946,7.25098,mm" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" excludeFromExports="0" followPresetName="">
-        <FrameColor red="0" green="0" alpha="255" blue="0"/>
-        <BackgroundColor red="255" green="255" alpha="255" blue="255"/>
+      <LayoutItem size="282.012,182.649,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="false" type="65639" blendMode="0" positionOnPage="9.44946,7.25098,mm" frame="false" mapRotation="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" visibility="1" excludeFromExports="0" frameJoinStyle="round" groupUuid="" position="9.44946,7.25098,mm" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" positionLock="false" id="" opacity="1" outlineWidthM="0.15,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.40919746780259914" ymin="-33.90848231674397084" xmin="18.40103928699269886" ymax="-33.90319854486631357"/>
+        <Extent ymin="-33.90848231674397084" xmax="18.40919746780259914" ymax="-33.90319854486631357" xmin="18.40103928699269886"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -32950,45 +33390,45 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid annotationPrecision="3" maximumIntervalWidth="100" topFrameDivisions="0" bottomAnnotationPosition="1" rotatedTicksEnabled="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" offsetY="0" rotatedAnnotationsMinimumAngle="0" show="0" bottomAnnotationDisplay="0" gridStyle="0" rightAnnotationDisplay="0" minimumIntervalWidth="50" intervalY="0" gridFramePenThickness="0.5" intervalX="0" unit="0" blendMode="0" rightFrameDivisions="0" leftAnnotationPosition="1" rotatedAnnotationsEnabled="0" topAnnotationPosition="1" leftFrameDivisions="0" rotatedTicksLengthMode="0" rotatedAnnotationsLengthMode="0" rotatedAnnotationsMarginToCorner="0" annotationFormat="0" bottomFrameDivisions="0" rightAnnotationDirection="0" bottomAnnotationDirection="0" gridFramePenColor="0,0,0,255" frameAnnotationDistance="1" annotationExpression="" position="3" gridFrameStyle="0" offsetX="0" topAnnotationDisplay="0" rotatedTicksMarginToCorner="0" rightAnnotationPosition="1" leftAnnotationDirection="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" crossLength="3" gridFrameWidth="2" name="Grid 1" gridFrameSideFlags="15" gridFrameMargin="0" showAnnotation="0" leftAnnotationDisplay="0">
+        <ComposerMapGrid offsetY="0" intervalY="0" rightFrameDivisions="0" gridFrameStyle="0" show="0" offsetX="0" maximumIntervalWidth="100" minimumIntervalWidth="50" annotationPrecision="3" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFramePenColor="0,0,0,255" rotatedAnnotationsLengthMode="0" rotatedTicksEnabled="0" blendMode="0" position="3" leftFrameDivisions="0" rightAnnotationPosition="1" gridFrameSideFlags="15" annotationExpression="" topAnnotationDirection="0" topFrameDivisions="0" annotationFormat="0" crossLength="3" rotatedTicksLengthMode="0" unit="0" gridStyle="0" gridFrameWidth="2" bottomAnnotationDirection="0" bottomAnnotationDisplay="0" rotatedTicksMarginToCorner="0" intervalX="0" frameAnnotationDistance="1" showAnnotation="0" rotatedAnnotationsMinimumAngle="0" name="Grid 1" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" leftAnnotationDisplay="0" bottomAnnotationPosition="1" leftAnnotationPosition="1" rightAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" leftAnnotationDirection="0" gridFramePenThickness="0.5" rightAnnotationDirection="0" frameFillColor1="255,255,255,255" gridFrameMargin="0" topAnnotationPosition="1" topAnnotationDisplay="0" bottomFrameDivisions="0" rotatedAnnotationsEnabled="0">
           <lineStyle>
-            <symbol name="" clip_to_extent="1" type="line" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="line" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -33019,44 +33459,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 name="" clip_to_extent="1" type="marker" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="marker" alpha="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <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">
                 <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"/>
@@ -33079,40 +33519,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 previewBkgrdColor="255,255,255,255" forcedItalic="0" fontLetterSpacing="0" textOrientation="horizontal" fontKerning="1" blendMode="0" allowHtml="0" multilineHeight="1" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontSize="10" textOpacity="1" fontWordSpacing="0" namedStyle="" fontSizeUnit="Point" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontStrikeout="0" textColor="0,0,0,255" fontUnderline="0" fontItalic="0">
+          <text-style fontSize="10" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
             <families/>
-            <text-buffer bufferDraw="0" bufferBlendMode="0" bufferNoFill="1" bufferSizeUnits="MM" bufferSize="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferJoinStyle="128" bufferSizeMapUnitScale="3x:0,0,0,0,0,0"/>
-            <text-mask maskType="0" maskSizeUnits="MM" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskJoinStyle="128" maskOpacity="1" maskSize="1.5" maskEnabled="0" maskedSymbolLayers=""/>
-            <background shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetX="0" shapeRotation="0" shapeSizeUnit="MM" shapeOffsetY="0" shapeBorderWidthUnit="MM" shapeBorderColor="128,128,128,255" shapeSizeX="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeBorderWidth="0" shapeDraw="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeRadiiY="0" shapeOffsetUnit="MM" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOpacity="1" shapeSizeY="0" shapeRadiiX="0">
-              <symbol name="fillSymbol" clip_to_extent="1" type="fill" frame_rate="10" alpha="1" force_rhr="0" is_animated="0">
+            <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+            <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+              <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" 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 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"/>
@@ -33127,29 +33567,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 shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowUnder="0" shadowOffsetGlobal="1" shadowDraw="0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowScale="100" shadowOffsetDist="1" shadowRadiusAlphaOnly="0" shadowColor="0,0,0,255"/>
+            <shadow shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
             <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>
@@ -33159,35 +33599,1208 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap margin="0.10000000000000001" scalingMode="2" atlasDriven="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings restrictLayers="0" enabled="0" forceLabelsInside="0" clippingType="0">
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="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 coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" pageNameExpression="&quot;FID&quot;" hideCoverage="1" coverageLayerName="residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0" coverageLayerProvider="ogr" enabled="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0"/>
+      <Atlas sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerName="residents_access" coverageLayerProvider="ogr" hideCoverage="1" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="0"/>
+    </Layout>
+    <Layout units="mm" name="Marshal Plan Day 1" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
+      <PageCollection>
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+          <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+            <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="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"/>
+            <prop v="miter" 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="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" 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>
+        <LayoutItem size="297,420,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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>
+              <Option/>
+            </customproperties>
+          </LayoutObject>
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+            <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+              <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="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"/>
+              <prop v="miter" 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="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" 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>
+        </LayoutItem>
+        <GuideCollection visible="1"/>
+      </PageCollection>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="false" wmsLegendWidth="50" positionOnPage="15.6525,12.5708,mm" itemRotation="0" zValue="8" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="15.6525,12.5708,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="21.6797,33,mm" positionLock="true" frameJoinStyle="miter" background="true" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <styles>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          </style>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+          <style marginTop="1" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+          <style marginTop="2" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          </style>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+        </styles>
+        <layer-tree-group>
+          <customproperties>
+            <Option/>
+          </customproperties>
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
+              <customproperties>
+                <Option type="Map">
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <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>
+          </layer-tree-group>
+          <custom-order enabled="0"/>
+        </layer-tree-group>
+      </LayoutItem>
+      <LayoutItem size="45.1194,7.36972,mm" referencePoint="0" labelText="MARSHAL POSITIONS" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,399.106,mm" frame="false" marginY="1" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,399.106,mm" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="16.2476,7.80192,mm" referencePoint="0" labelText="Page [% &quot;page&quot; %]" htmlState="0" zValue="6" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,406.988,mm" frame="false" marginY="1" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,406.988,mm" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="27.7839,7.51682,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="214.292,406.988,mm" frame="false" marginY="1" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="214.292,406.988,mm" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="56.3557,7.36902,mm" referencePoint="0" labelText="[%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;%]" htmlState="0" zValue="4" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="185.72,399.107,mm" frame="false" marginY="1" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="185.72,399.107,mm" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="49.3143,31.2967,mm" referencePoint="0" zValue="3" anchorPoint="8" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="243.319,382.696,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="28.8527" groupUuid="" pictureWidth="49.3143" northMode="0" position="243.319,382.696,mm" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
+                </Option>
+              </Option>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutItem>
+      <LayoutItem size="236.083,0.14328,mm" referencePoint="0" zValue="2" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="5.84321,406.626,mm" frame="false" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.84321,406.626,mm" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+          <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+            <Option type="Map">
+              <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"/>
+            <prop v="miter" 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="0,0,0,255" k="outline_color"/>
+            <prop v="solid" k="outline_style"/>
+            <prop v="0.3" 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>
+      </LayoutItem>
+      <LayoutItem size="286.94,392.396,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.03,5.9483,mm" frame="false" mapRotation="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.03,5.9483,mm" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal overview" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <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 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 name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
+                </Option>
+              </Option>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.93775368136344639" xmax="18.40978433395395442" ymax="-33.91465407864861703" xmin="18.3928927268106257"/>
+        <LayerSet/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <customproperties>
+        <Option type="Map">
+          <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~~~fence_groups_cbaea960_3348_4aea_b155_46e5d310f792~~~route_markers_6943d827_bf32_40af_988d_60a736c1d3e1~~~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>
+      </customproperties>
+      <Atlas sortFeatures="1" sortKey="page" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" filterFeatures="1" featureFilter="regexp_match( &quot;day&quot;, '1' )" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" enabled="1"/>
+    </Layout>
+    <Layout units="mm" name="Marshal Plan Day 2" printResolution="120" worldFileMap="">
+      <Snapper snapToGrid="0" snapToItems="1" snapToGuides="1" tolerance="5"/>
+      <Grid resolution="10" resUnits="mm" offsetY="0" offsetUnits="mm" offsetX="0"/>
+      <PageCollection>
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+          <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+            <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="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"/>
+            <prop v="miter" 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="0,0,0,255" k="outline_color"/>
+            <prop v="no" k="outline_style"/>
+            <prop v="0.26" 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>
+        <LayoutItem size="297,420,mm" referencePoint="0" zValue="0" itemRotation="0" background="true" type="65638" blendMode="0" positionOnPage="0,0,mm" frame="false" uuid="{1d6ee08b-2bae-454e-9747-92fe53ff794e}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="0,0,mm" templateUuid="{1d6ee08b-2bae-454e-9747-92fe53ff794e}" positionLock="false" id="" opacity="1" outlineWidthM="0.3,mm">
+          <FrameColor blue="0" green="0" red="0" alpha="255"/>
+          <BackgroundColor blue="255" green="255" red="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>
+              <Option/>
+            </customproperties>
+          </LayoutObject>
+          <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+            <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+              <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="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"/>
+              <prop v="miter" 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="35,35,35,255" k="outline_color"/>
+              <prop v="no" k="outline_style"/>
+              <prop v="0.26" 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>
+        </LayoutItem>
+        <GuideCollection visible="1"/>
+      </PageCollection>
+      <LayoutItem minSymbolSize="0" symbolWidth="7" boxSpace="2" legendFilterByAtlas="0" id="" fontColor="#000000" outlineWidthM="0.3,mm" uuid="{80d2d637-cb6b-4919-8d13-8e8608fc27b9}" symbolHeight="4" referencePoint="0" lineSpacing="1" frame="false" wmsLegendWidth="50" positionOnPage="15.6525,12.5708,mm" itemRotation="0" zValue="8" excludeFromExports="0" maxSymbolSize="0" blendMode="0" titleAlignment="1" groupUuid="" wmsLegendHeight="25" columnSpace="2" position="15.6525,12.5708,mm" opacity="1" splitLayer="0" wrapChar="" type="65642" symbolAlignment="1" equalColumnWidth="1" columnCount="1" size="21.6797,33,mm" positionLock="true" frameJoinStyle="miter" background="true" map_uuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" rasterBorder="1" resizeToContents="1" rasterBorderColor="0,0,0,255" title="" visibility="1" templateUuid="{80d2d637-cb6b-4919-8d13-8e8608fc27b9}" rasterBorderWidth="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <styles>
+          <style name="title" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" style=""/>
+          </style>
+          <style name="group" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+          <style marginTop="1" name="subgroup" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+          <style marginTop="2" name="symbol" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="0" strikethrough="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" style=""/>
+          </style>
+          <style marginTop="2" marginLeft="2" name="symbolLabel" indent="0" alignment="1">
+            <styleFont italic="0" underline="0" bold="1" strikethrough="0" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" style="Semibold"/>
+          </style>
+        </styles>
+        <layer-tree-group>
+          <customproperties>
+            <Option/>
+          </customproperties>
+          <layer-tree-group expanded="1" name="Routes" groupLayer="" checked="Qt::Checked">
+            <customproperties>
+              <Option/>
+            </customproperties>
+            <layer-tree-layer expanded="1" name="all_routes" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" legend_split_behavior="0" providerKey="ogr" checked="Qt::Checked" legend_exp="" source="./all_routes.shp|layername=all_routes">
+              <customproperties>
+                <Option type="Map">
+                  <Option name="expandedLegendNodes" type="invalid"/>
+                  <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>
+          </layer-tree-group>
+          <custom-order enabled="0"/>
+        </layer-tree-group>
+      </LayoutItem>
+      <LayoutItem size="45.1194,7.36972,mm" referencePoint="0" labelText="MARSHAL POSITIONS" htmlState="0" zValue="7" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,399.106,mm" frame="false" marginY="1" uuid="{21317d02-e72f-414d-80e6-3dc4704f496e}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,399.106,mm" templateUuid="{21317d02-e72f-414d-80e6-3dc4704f496e}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="63" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="16.2476,7.80192,mm" referencePoint="0" labelText="Page [% &quot;page&quot; %]" htmlState="0" zValue="6" itemRotation="0" background="false" halign="1" type="65641" blendMode="0" positionOnPage="5.69321,406.988,mm" frame="false" marginY="1" uuid="{043d6b93-d56f-4b5b-943a-bae20902ecc2}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.69321,406.988,mm" templateUuid="{043d6b93-d56f-4b5b-943a-bae20902ecc2}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="27.7839,7.51682,mm" referencePoint="0" labelText="REVISION 1.0" htmlState="0" zValue="5" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="214.292,406.988,mm" frame="false" marginY="1" uuid="{767bf4e2-dd2d-40bf-a1a1-2a0799413ce0}" visibility="1" valign="32" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="214.292,406.988,mm" templateUuid="{767bf4e2-dd2d-40bf-a1a1-2a0799413ce0}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="93.5757,7.36902,mm" referencePoint="0" labelText="[%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;%]" htmlState="0" zValue="4" itemRotation="0" background="false" halign="2" type="65641" blendMode="0" positionOnPage="148.5,399.107,mm" frame="false" marginY="1" uuid="{d293ba25-5164-4566-9ce7-61cb613b0bc1}" visibility="1" valign="64" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="148.5,399.107,mm" templateUuid="{d293ba25-5164-4566-9ce7-61cb613b0bc1}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" marginX="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <text-style fontSize="12" previewBkgrdColor="255,255,255,255" multilineHeight="1" fontStrikeout="0" textColor="0,0,0,255" textOrientation="horizontal" namedStyle="" blendMode="0" allowHtml="0" fontWeight="50" textOpacity="1" forcedItalic="0" forcedBold="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontSizeUnit="Point" fontWordSpacing="0" fontLetterSpacing="0" fontFamily="Myriad Pro" capitalization="0" fontKerning="1" fontItalic="0">
+          <families/>
+          <text-buffer bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferBlendMode="0" bufferSize="1" bufferDraw="0" bufferColor="255,255,255,255" bufferSizeUnits="MM" bufferNoFill="1" bufferJoinStyle="128"/>
+          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskEnabled="0" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0"/>
+          <background shapeOffsetUnit="MM" shapeOffsetX="0" shapeDraw="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeSVGFile="" shapeRotationType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeType="0" shapeSizeX="0" shapeBorderWidthUnit="MM" shapeBorderWidth="0" shapeRadiiY="0" shapeOpacity="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderColor="128,128,128,255" shapeFillColor="255,255,255,255" shapeSizeUnit="MM" shapeJoinStyle="64" shapeBlendMode="0" shapeRadiiUnit="MM" shapeSizeY="0" shapeRotation="0" shapeSizeType="0">
+            <symbol name="fillSymbol" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+              <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+                <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 shadowOffsetAngle="135" shadowDraw="0" shadowOffsetUnit="MM" shadowColor="0,0,0,255" shadowUnder="0" shadowOpacity="0.69999999999999996" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadius="1.5" shadowRadiusAlphaOnly="0" shadowOffsetDist="1" shadowOffsetGlobal="1" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6"/>
+          <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 size="49.3143,31.2967,mm" referencePoint="0" zValue="3" anchorPoint="8" pictureRotation="0" svgFillColor="255,255,255,255" svgBorderWidth="0.2" itemRotation="0" background="false" type="65640" blendMode="0" positionOnPage="243.319,382.696,mm" frame="false" svgBorderColor="0,0,0,255" uuid="{b3ed3305-8f0b-47bc-81b5-23c34cc7f4e9}" northOffset="0" visibility="1" excludeFromExports="0" frameJoinStyle="miter" pictureHeight="28.8527" groupUuid="" pictureWidth="49.3143" northMode="0" position="243.319,382.696,mm" templateUuid="{b3ed3305-8f0b-47bc-81b5-23c34cc7f4e9}" resizeMode="0" positionLock="true" id="" opacity="1" file="../Gun_Run_Logo.png" outlineWidthM="0.3,mm" mapUuid="" mode="1">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedSource" type="Map">
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
+                </Option>
+              </Option>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+      </LayoutItem>
+      <LayoutItem size="236.083,0.14328,mm" referencePoint="0" zValue="2" itemRotation="0" background="false" shapeType="1" type="65643" cornerRadiusMeasure="0,mm" blendMode="0" positionOnPage="5.84321,406.626,mm" frame="false" uuid="{a24294c4-895b-4801-b08b-9e3763b298cf}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.84321,406.626,mm" templateUuid="{a24294c4-895b-4801-b08b-9e3763b298cf}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="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>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <symbol name="" is_animated="0" clip_to_extent="1" force_rhr="0" frame_rate="10" type="fill" alpha="1">
+          <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 locked="0" pass="0" class="SimpleFill" enabled="1">
+            <Option type="Map">
+              <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"/>
+            <prop v="miter" 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="0,0,0,255" k="outline_color"/>
+            <prop v="solid" k="outline_style"/>
+            <prop v="0.3" 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>
+      </LayoutItem>
+      <LayoutItem size="286.94,392.396,mm" referencePoint="0" isTemporal="0" zValue="1" itemRotation="0" background="true" followPreset="true" type="65639" blendMode="0" positionOnPage="5.03,5.9483,mm" frame="false" mapRotation="0" uuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" visibility="1" excludeFromExports="0" frameJoinStyle="miter" groupUuid="" position="5.03,5.9483,mm" templateUuid="{fd29fce6-5578-4281-a759-cf0454fd8610}" positionLock="true" id="" opacity="1" outlineWidthM="0.3,mm" labelMargin="0,mm" keepLayerSet="false" drawCanvasItems="false" followPresetName="Marshal overview" mapFlags="0">
+        <FrameColor blue="0" green="0" red="0" alpha="255"/>
+        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutObject>
+          <dataDefinedProperties>
+            <Option type="Map">
+              <Option name="name" value="" type="QString"/>
+              <Option name="properties" type="Map">
+                <Option name="dataDefinedMapScale" type="Map">
+                  <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 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 name="active" value="false" type="bool"/>
+                  <Option name="field" value="" type="QString"/>
+                  <Option name="type" value="2" type="int"/>
+                </Option>
+              </Option>
+              <Option name="type" value="collection" type="QString"/>
+            </Option>
+          </dataDefinedProperties>
+          <customproperties>
+            <Option/>
+          </customproperties>
+        </LayoutObject>
+        <Extent ymin="-33.91857233280978789" xmax="18.42124635930919041" ymax="-33.89547273009495854" xmin="18.4043547521658617"/>
+        <LayerSet/>
+        <AtlasMap margin="0" scalingMode="2" atlasDriven="1"/>
+        <labelBlockingItems/>
+        <atlasClippingSettings restrictLayers="0" clippingType="0" enabled="0" forceLabelsInside="0">
+          <layersToClip/>
+        </atlasClippingSettings>
+        <itemClippingSettings clippingType="0" clipSource="" enabled="0" forceLabelsInside="0"/>
+      </LayoutItem>
+      <customproperties>
+        <Option type="Map">
+          <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 sortFeatures="1" sortKey="page" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" sortAscending="1" hideCoverage="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" filterFeatures="1" featureFilter="regexp_match( &quot;day&quot;, '2' )" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" enabled="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <ProjectViewSettings UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent xmax="18.53236032035363223" ymin="-33.99333812871999072" xmin="18.3729499167874053" ymax="-33.90758844505358383">
+    <DefaultViewExtent ymin="-33.95282887119950033" xmax="18.45882209706136834" ymax="-33.88874265129132368" xmin="18.33968451262036226">
       <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>
@@ -33201,10 +34814,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db">
+  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings cumulativeTemporalRange="0" frameRate="1" timeStep="1" timeStepUnit="h"/>
+  <ProjectTimeSettings timeStep="1" timeStepUnit="h" frameRate="1" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
@@ -33213,29 +34826,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/all_routes.dbf b/GIS Base Map/all_routes.dbf
index 8bb4960..67c8776 100644
Binary files a/GIS Base Map/all_routes.dbf and b/GIS Base Map/all_routes.dbf differ
diff --git a/GIS Base Map/all_routes.shp b/GIS Base Map/all_routes.shp
index d0f8643..560a345 100644
Binary files a/GIS Base Map/all_routes.shp and b/GIS Base Map/all_routes.shp differ
diff --git a/GIS Base Map/all_routes.shx b/GIS Base Map/all_routes.shx
index 95e219c..33a12f5 100644
Binary files a/GIS Base Map/all_routes.shx and b/GIS Base Map/all_routes.shx differ
diff --git a/GIS Base Map/marshal overviews.dbf b/GIS Base Map/marshal overviews.dbf
index fa1fda2..3d34ef8 100644
Binary files a/GIS Base Map/marshal overviews.dbf and b/GIS Base Map/marshal overviews.dbf differ
diff --git a/GIS Base Map/marshal overviews.qix b/GIS Base Map/marshal overviews.qix
deleted file mode 100644
index cdd6ad4..0000000
Binary files a/GIS Base Map/marshal overviews.qix and /dev/null differ
diff --git a/GIS Base Map/marshal overviews.shp b/GIS Base Map/marshal overviews.shp
index 77d4ebe..ba2bac7 100644
Binary files a/GIS Base Map/marshal overviews.shp and b/GIS Base Map/marshal overviews.shp differ
diff --git a/GIS Base Map/marshal overviews.shx b/GIS Base Map/marshal overviews.shx
index ff452f2..5da04c1 100644
Binary files a/GIS Base Map/marshal overviews.shx and b/GIS Base Map/marshal overviews.shx differ
diff --git a/GIS Base Map/marshals_by_position.csv b/GIS Base Map/marshals_by_position.csv
index 9b5c6f4..4c211a2 100644
--- a/GIS Base Map/marshals_by_position.csv	
+++ b/GIS Base Map/marshals_by_position.csv	
@@ -1,403 +1,403 @@
-"position","club","firstname","surname","name","phone","email","captain","captain_phone","captain_email","races","first_runner","last_runner","instructions"
-101,"AAC","Darawees","Gasant","Darawees Gasant","078 192 7349","darawees@webmail.co.za","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
-102,"AAC","Lynn","Davis","Lynn Davis","082 999 0333","lynncatherinedavis@gmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
-103,"AAC","Cido","Yildez","Cido Yildez","0825937464","cido.yildiz@gmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
-104,"AAC","Gabiba","Talip","Gabiba Talip","083 477 1773","gabiba@mweb.co.za","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
-105,"AAC","John","Damata","John Damata","073 966 6005","wtffor@gmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
-106,"AAC","Sonja","Damata","Sonja Damata","082 809 7788","srdamata@gmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
-107,"AAC","Khalied","Hanslo","Khalied Hanslo","083 285 5941","hansolo786@gmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
-108,"AAC","Wasielah","Adams","Wasielah Adams","082 931 4762","wasiadams@hotmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
-109,"AAC","Fareed","Adams","Fareed Adams","076 094 5128","gabiba@mweb.co.za","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
-110,"AAC","Michelle","Cupido","Michelle Cupido","083 430 2844","michellekippie289@gmail.com","William van Dugteren","082 774 1980",,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45. Once the races have started, control cars at club entrance."
-111,"AAC","Mick","Murphy","Mick Murphy","084 529 0967","mick@murphyprojects.co.za","Keith Bake","083 245 8757",,"21 & 5","08:30am","8:45am","Direct 5KM race up Beach Road towards the Dock Road circle. Prevent cars from accessing Beach Road from Haul Road."
-112,"AAC","Gill","Smalberger","Gill Smalberger","072 348 3615","smally@intekom.co.za","Keith Bake","083 245 8757",,"21 & 10","06:30am","07:35am","Control cars at hotel entrance."
-113,"AAC","Tracey","Ellis","Tracey Ellis","082 486 0300","tracey.smalberger@za.ey.com","Keith Bake","083 245 8757",,"21 & 10","06:30am","07:35am","Control cars at club entrance."
-114,"AAC","Dave","Bywater","Dave Bywater","083 500 0845","davidbywater845@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Direct 21KM runners from Granger Bay Boulevard on to Dock Road on the mountain side of the island."
-115,"AAC","Tissa","Fuchsloch","Tissa Fuchsloch","082 907 7234","tissa.fuchsloch@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Direct 21KM runners from Granger Bay Boulevard on to Dock Road on the mountain side of the island."
-116,"AAC","Elizabeth","McGeever","Elizabeth McGeever","084 621 7066","emcgeever@waterfront.co.za","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Direct 21KM runners from Granger Bay Boulevard on to Dock Road on the mountain side of the island."
-117,"AAC","Kim","Botti","Kim Botti","082 520 6125","kimb@leebotti.co.za","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
-118,"AAC","Mick","Murphy","Mick Murphy","084 529 0967","mick@murphyprojects.co.za","Stephanie Donachie","061 365 1127",,"21 & 5","06:36am","08:45am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-119,"AAC","Odette","Geldenhuys","Odette Geldenhuys","083 776 6611","odette.g@mweb.co.za","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-120,"AAC","Lawrence","Swanson","Lawrence Swanson","083 389 2604","lawrences@afreshbrands.co.za","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-121,"AAC","Susan","Winckworth","Susan Winckworth","072 240 5485","winckworthsusan@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-122,"AAC","Kerry","Jack","Kerry Jack","082 782 7297","kerryjackbloodstock@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-123,"AAC","Lindsay","Dentlinger","Lindsay Dentlinger","074 101 2899","lindsaydentlinger@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-124,"AAC","Byron","Rode","Byron Rode","084 874 5650","byronrode@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-125,"AAC","Andre","Senremo","Andre Senremo","060 495 1173","atkleinsmith@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-126,"AAC","Anne","Zimmerman","Anne Zimmerman","083 384 1730","anne.zimmerman@foord.co.za","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-127,"AAC","Howard","Silke","Howard Silke","083 557 5840","howard.silke@bassgordon.co.za","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-128,"AAC","Michael","Eastman","Michael Eastman","082 907 7246","asics@iafrica.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-129,"AAC","Shen","Eastman","Shen Eastman","082 907 7246","asics@iafrica.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-130,"AAC","Jana","van Houwelingen","Jana van Houwelingen","082 874 3839","janavh04@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-131,"AAC","Nazeem","Hendricks","Nazeem Hendricks","071 866 0481","nazeemhendricks@icloud.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-132,"AAC","Marisa","Smalberger","Marisa Smalberger","083 408 3371","marisa.smalberger@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-133,"AAC","Brenda","Pringle","Brenda Pringle","083 658 2179","brenda.pringle@commsure.co.za","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-134,"AAC","Lisa","Pringle","Lisa Pringle","083 650 4625","lisakpringle@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-135,"AAC","Gloria","Chitedze","Gloria Chitedze","061 414 6665","gloriachitedze@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:42am","07:10am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
-136,"AAC","Max","Wimmer","Max Wimmer","082 669 9993","maxwimmerct@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:42am","07:10am","Direct runners towards Ebenezer Road on inside of traffic circle; control cars on sea side of road/traffic circle."
-137,"AAC","Elizna","Read","Elizna Read","084 922 1122","elizna.read@pbtgroup.co.za","Stephanie Donachie","061 365 1127",,21,"06:42am","07:10am","Direct runners towards Ebenezer Road on inside of traffic circle; control cars on sea side of road/traffic circle."
-138,"AAC","Lloyd","Goliath","Lloyd Goliath","082 387 0732","lloydgoliath@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:42am","07:10am","Direct runners towards Ebenezer Road on inside of traffic circle; control cars on sea side of road/traffic circle."
-139,"AAC","Sheffield","Wakefield","Sheffield Wakefield","083 450 0468","sheffieldwakefield@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:42am","07:10am","Direct runners towards Ebenezer Road on inside of traffic circle; control cars on sea side of road/traffic circle."
-140,"AAC","Elzahn","Oosthuizen","Elzahn Oosthuizen","083 236 2399","elzahno@gmail.com","Stephanie Donachie","061 365 1127",,21,"06:42am","07:10am","Direct runners up Ebenezer Road on Sea Point side of road; control cars at Port Road."
-141,"AAC","Bridget","Sherman","Bridget Sherman","072 424 6233","bridgetsherman24@gmail.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:10am","Direct runners on to Prestwich Street on mountain side of road; control cars."
-142,"AAC","Lindsay","Evard","Lindsay Evard","083 677 6647","Lindsay.evard@aig.com","Collin Sedeman","083 540 3252",,21,"06:45am","07:20am","Direct runners on to Fan Walk towards the underpass; control cars turning off Somerset Road."
-143,"AAC","Stephen","Seymour","Stephen Seymour","072 142 1013","steve.seymour161@gmail.com","Collin Sedeman","083 540 3252",,21,"06:45am","07:20am","Direct runners on to Fan Walk towards the underpass; control cars turning off Somerset Road."
-144,"AAC","Caroline","Balkwill","Caroline Balkwill","072 992 5115","caroline@coricraft.co.za","Collin Sedeman","083 540 3252",,21,"06:45am","07:20am","Keep runners on Fan Walk towards the underpass."
-145,"AAC","Carl","Ronander","Carl Ronander","071 673 6005","Carl@shimansky.co.za","Collin Sedeman","083 540 3252",,"21 & 5","06:45am","07:20am","Keep runners on Fan Walk towards the underpass."
-146,"AAC","Jeff","Singer","Jeff Singer","083 254 5535","jeff@rbs.co.za","Collin Sedeman","083 540 3252",,21,"06:42am","07:10am","Direct runners on to Prestwich Street on mountain side of road; control cars."
-147,"AAC","Marc","Cohen","Marc Cohen","083 675 3545","marc@cohen.co.za","Collin Sedeman","083 540 3252",,21,"06:42am","07:10am","Direct runners on to Prestwich Street on mountain side of road; control cars."
-148,"AAC","Tamryn","West","Tamryn West","072 589 1331","tamrynwest06@gmail.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Keep 21KM on the Sea Point side of the road towards the Waterfront; keep the 5KM on the Sea Point side of the road towards Fritz Sonnenberg Road."
-149,"AAC","Luke","Serafin","Luke Serafin","079 890 0094","lukebrian.serafin@gmail.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Keep 21KM on the Sea Point side of the road towards the Waterfront; keep the 5KM on the Sea Point side of the road towards Fritz Sonnenberg Road."
-150,"AAC","Gerald","Aronson","Gerald Aronson","082 569 5627","klik@mweb.co.za","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
-151,"AAC","Ben","Gillies","Ben Gillies","082 648 8285","gillies.ben@gmail.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
-152,"AAC","Maria","Lewis","Maria Lewis","060 683 6012","gabiba@mweb.co.za","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
-201,"AAC","Eduan","Coetzee","Eduan Coetzee","071 257 9565","ecoetzee920827@gmail.com","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Keep runners on Fan Walk towards the underpass; keep Fan Walk clear of cars; direct returning 5KM runners through the parking lot."
-202,"AAC","Robert","Zive","Robert Zive","083 700 7838","Rzive@snoekws.co.za","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Keep runners on Fan Walk towards the underpass; keep Fan Walk clear of cars; direct returning 5KM runners through the parking lot."
-203,"AAC","Melissa","Weber","Melissa Weber","072 249 7297","melissadweber@gmail.com","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Direct 21KM runners into underpass; keep outgoing 5KM runners on sea side of Fan Walk and direct returning 5KM runners through the parking lot."
-204,"AAC","Prieur","du Plessis","Prieur du Plessis","072 189 7900","prieur@gmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM and returning 5KM runners through underpass and out towards Fan Walk along Main Road."
-205,"AAC","Simon","Midgley","Simon Midgley","083 957 0150","simon.midgley101@gmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct incoming 5KM runners out underpass on sea side of Fan Walk towards town; direct returning 21KM and 5KM runners through underpass and out towards Fan Walk along Main Road."
-206,"AAC","Gretchen","Weber","Gretchen Weber","072 340 9074","Gretchen.weber91@gmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct incoming 5KM runners into underpass and out towards sea side of Fan Walk along Main Road."
-207,"AAC","James","Willis","James Willis","083 306 7807","james@moresport.co.za","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM and 10KM runners out of underpass towards Sea Point along Fan Walk on Main Road; direct returning 5KM runners on to Forecourt towards Sea Point."
-208,"AAC","Comfort","Bunting","Comfort Bunting","082 441 9955","hlupheka@hotmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
-209,"AAC","Basil","Mashappie","Basil Mashappie","079 490 4329","bmashappie@parliament.gov.za","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
-210,"AAC","Claire","van den Heever","Claire van den Heever","079 324 6787","clairevdh@gmail.com","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
-211,"AAC","Iain","Manley","Iain Manley","081 868 0197","iain@voicemap.me","Jarrod Assenheim","082 443 3209",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
-212,"AAC","Rachel","Marks","Rachel Marks","081 476 8247","rachmarks@hotmail.com","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Turn 5KM runners around back towards Sea Point from sea side to mountainside of Fan Walk; direct 21KM runners towards Sea Point on Fan Walk."
-213,"AAC","John","Kolbe","John Kolbe","071 231 6940","kolbejon@gmail.com","Collin Sedeman","083 540 3252",,"21 & 5","06:48am","09:06am","Turn 5KM runners around back towards Sea Point from sea side to mountainside of Fan Walk; direct 21KM runners towards Sea Point on Fan Walk."
-214,"AAC","Barney ","Israells","Barney Israells","082 874 3839","barney@vegtech.co.za","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","09:00am","Direct 21KM from Fritz Sonnenberg down Granger Bay Blvd on stadium side of road; direct 5KM to turn into Fritz Sonnenberg towards stadium."
-215,"AAC","Kobus","Ehlers","Kobus Ehlers","073 188 6583","kobus@kobusehlers.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","09:00am","Direct 21KM from Fritz Sonnenberg down Granger Bay Blvd on stadium side of road; direct 5KM to turn into Fritz Sonnenberg towards stadium."
-216,"AAC","Sarietha","Engelbrecht","Sarietha Engelbrecht","082 567 7772","sarietha.engelbrecht@gmail.com","Jarrod Assenheim","082 443 3209",,"21 & 5","06:36am","09:00am","Direct 21KM from Fritz Sonnenberg down Granger Bay Blvd on stadium side of road; direct 5KM to turn into Fritz Sonnenberg towards stadium."
-217,"AAC","Cindy","Albertyn","Cindy Albertyn","072 574 9034","cindy.albertyn@gmail.com","Keith Bake","083 245 8757",,"21 & 5","06:36am","09:40am","Direct 21KM runners from Forecourt to Fritz Sonnenberg towards Granger Bay Boulevard; direct 5KM from Fritz Sonnenberg on to Forecourt."
-218,"AAC","Rene","Albertyn","Rene Albertyn","079 803 6080","rene.albertyn@gmail.com","Keith Bake","083 245 8757",,"21 & 5","06:36am","08:48am","Direct 21KM runners from Forecourt towards Fritz Sonnenberg; after last 21KM runner, lay out cones to direct 5KM from Fritz Sonnenberg on a hard right towards the underpass, and direct 5KM the same way yourself."
-219,"AAC","Matthew","Welz","Matthew Welz","083 791 1332","mfwelz@gmail.com","Keith Bake","083 245 8757",,"21,10 & 5","06:36am","09:40am","Direct 21KM runners across Forecourt towards stadium; direct 10KM runners to underpass; direct 5KM runners towards Sea Point and finish field."
-220,"AAC","Jarryd","Phillips","Jarryd Phillips","079 733 7249","jarryd@teamphillips.co.za","Keith Bake","083 245 8757",,"10 & 5","07:33am","09:40am","Direct 21KM runners across Forecourt towards stadium; direct 10KM runners to underpass; direct 5KM runners towards Sea Point and finish field."
-221,"AAC","Brendon","van Niekerk","Brendon van Niekerk","082 680 6762","brendon.van.niekerk@gmail.com","Allan Young","082 259 5713",,"21,10 & 5","06:48am","09:00am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
-222,"AAC","Brian","Hoskin","Brian Hoskin","071 373 1771","brian@hosking.co.za","Allan Young","082 259 5713",,"21,10 & 5","06:48am","09:00am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
-223,"AAC","Stacey","Hardy","Stacey Hardy","076 639 1706","stacey.rethman@gmail.com","Allan Young","082 259 5713",,"21 & 10","06:51am","09:00am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM toward Sea Point on Fan Walk. Control cars at parking entrance."
-224,"AAC","Brandon","Moulder","Brandon Moulder","083 643 2087","brandonmoulder@gmail.com","Allan Young","082 259 5713",,"21 & 10","06:48am","09:00am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM toward Sea Point on Fan Walk. Control cars at parking entrance."
-225,"AAC","Nicole","Swanson","Nicole Swanson","083 273 8190","nicoles@afreshbrands.co.za","Keith Bake","083 245 8757",,"21 & 10","06:33am","07:33am","Direct 21KM and 10KM runners down Vlei Road. Control pedestrians across Vlei Road."
-226,"AAC","Stephen","Swanson","Stephen Swanson","021 531 3713","stephens@afreshbrands.co.za","Keith Bake","083 245 8757",,"21 & 10","06:33am","07:33am","Direct 21KM and 10KM runners down Vlei Road. Control pedestrians across Vlei Road."
-227,"AAC","Elisha","Berridge","Elisha Berridge","083 453 2739","elishaberridge@gmail.com","Keith Bake","083 245 8757",,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM runners at start down town side of Fritz Sonnenberg; direct finishing 21KM runners down Sea Point side of Fritz Sonnenberg."
-228,"AAC","Dempsey","Wallansan","Dempsey Wallansan","076 9319806","AFRILOGISTICS@TELKOMSA.NET","Keith Bake","083 245 8757",,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM runners at start down town side of Fritz Sonnenberg; direct finishing 21KM runners down Sea Point side of Fritz Sonnenberg."
-229,"AAC","Ilan","Russon","Ilan Russon","082 884 3250","ilanrusson@gmail.com","Keith Bake","083 245 8757",,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM runners at start down town side of Fritz Sonnenberg; direct finishing 21KM runners down Sea Point side of Fritz Sonnenberg."
-230,"AAC","Alexandra","Willis-Smith","Alexandra Willis-Smith","073 757 9085","willissmitha@gmail.com","Keith Bake","083 245 8757",,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM runners down Fritz Sonnenberg; keep 10KM runners on town side; control cars at entrance to Golf Club and prevent cars driving towards stadium."
-231,"AAC","Daniel","Eigelaar","Daniel Eigelaar","073 792 6524","daniel.eigelaar@gmail.com","Keith Bake","083 245 8757",,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM runners down Fritz Sonnenberg; keep 10KM runners on town side; control cars at Bay Road and prevent cars driving towards stadium."
-232,"AAC","David","Frylinck","David Frylinck","084 387 5348","david.frylinck@gmail.com","Keith Bake","083 245 8757",,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM from start down Fritz Sonnenberg past stadium; direct 21KM finishers into Stephan Way towards Hamilton."
-233,"AAC","Nienke","Pannekoek","Nienke Pannekoek","066 156 5153","nienkepannekoek@hotmail.com","Keith Bake","083 245 8757",,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM from start down Fritz Sonnenberg past stadium; direct 21KM finishers into Stephan Way towards Hamilton."
-234,"AAC","Nthabeleng","Tsusane","Nthabeleng Tsusane","082 381 9923","otsusane@gmail.com","Keith Bake","083 245 8757",,21,"07:36am","10:00am","Direct 21KM down Stephan Way on to fields; control car access to Hamilton."
-235,"AAC","Desmond","Judge","Desmond Judge","082 492 1015","desmond@mjudge.co.za","Keith Bake","083 245 8757",,21,"07:36am","10:00am","Direct 21KM towards finish on fields."
-236,"AAC","Tim","Siebritz","Tim Siebritz","076 679 161","tsiebritz@gmail.com","Allan Young","082 259 5713",,"21,10 & 5","06:36am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
-237,"AAC","Sherri","Liss","Sherri Liss","083 859 0234","shrrliss@gmail.com","Allan Young","082 259 5713",,"21,10 & 5","06:48am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
-238,"AAC","Melvyn","Office","Melvyn Office","073 898 9386","melvyn.office@gmail.com","Keith Bake","083 245 8757",,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road; keep Vlei Road clear of pedestrians for 5KM runners."
-239,"AAC","Kylie","Hoffman","Kylie Hoffman","083 643 3831","kylzie@gmail.com","Keith Bake","083 245 8757",,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road to Main Road; direct 5KM runners down Vlei Road to finish; keep Vlei Road clear of pedestrians."
-240,"AAC","Caspar","Greef","Caspar Greef","082 456 4054","greeff@adept.co.za","Keith Bake","083 245 8757",,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road to Main Road; direct 5KM runners down Vlei Road to finish; keep Vlei Road clear of pedestrians."
-241,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Direct 21KM runners to follow Beach Road to Fritz Sonnenberg; direct 10KM runners right into Green Point Park."
-242,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Direct 21KM runners to follow Beach Road to Fritz Sonnenberg; direct 10KM runners right into Green Point Park."
-243,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",10,"07:55am","09:30am","Keep 10KM Runners on town side of path through the park and pedestrians on the Sea Point side."
-244,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",10,"07:57am","09:30am","Control traffic on Bay Road allowing runners to cross into park and traffic to flow when there is the opportunity to let them pass."
-245,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",10,"07:57am","09:30am","Control traffic on Bay Road allowing runners to cross into park and traffic to flow when there is the opportunity to let them pass."
-246,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",10,"07:57am","09:30am","Keep 10KM runners on town side of path through the park and pedestrians on the Sea Point side."
-247,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",10,"07:57am","09:30am","Keep 10KM runners on town side of path through the park and pedestrians on the Sea Point side."
-248,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",10,"07:57am","09:30am","Keep 10KM runners on town side of path through the park and pedestrians on the Sea Point side."
-249,"AAC","Preggy","Moonsammy","Preggy Moonsammy","076 552 7003","Preggy.Moonsamy@netcare.co.za","Keith Bake","083 245 8757",,10,"07:42am","09:10am","Direct 10KM finishers out of park and into finish field through gate."
-250,"AAC","Carla","Jacobus","Carla Jacobus","082 059 5125","carlaj@robben-island.org.za","Keith Bake","083 245 8757",,10,"07:42am","09:10am","Direct 10KM finishers towards finish."
-251,"AAC","Sibulelo","Mayekiso","Sibulelo Mayekiso","078 473 5651","sibulelo.mayekiso@gmail.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars at Bennett Road."
-252,"AAC","Caryn","Querido","Caryn Querido","074 457 9582","carrie.querido@gmail.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Napier Road."
-253,"AAC","Devyn","Lee","Devyn Lee","076 819 1127","leedevyn355@gmail.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Napier Road."
-254,"AAC","Melville","Silke","Melville Silke","072 132 5572","melville.silke@gmail.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Alfred Road."
-255,"AAC","Patrick","Willenberg","Patrick Willenberg","071 231 6940","kolbejon@gmail.com","Collin Sedeman","083 540 3252",,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Alfred Road."
-256,"AAC","JP","Moodie","JP Moodie","083 999 3735","za.jeanpaul@gmail.com","Collin Sedeman","083 540 3252",,21,"06:45am","07:20am","Direct 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
-257,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",21,"06:25am","10:00am","Keep 21KM runners to sea side of Beach Road and on pavement when possible."
-258,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",21,"06:25am","10:00am","Control traffic at junction of Beach and Rothsay Place. Keep 21KM runners to sea side of Beach Road and on pavement when possible."
-259,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",21,"06:25am","10:00am","Control traffic at junction of Beach and Rothsay Place. Keep 21KM runners to sea side of Beach Road and on pavement when possible."
-260,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Keep 21KM runners on sea side of Beach Road and on pavement when possible; direct 10KM runners right into Green Point Park."
-261,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Direct 21KM runners to follow Beach Road to Fritz Sonnenberg; direct 10KM runners right into Green Point Park."
-262,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Direct 21KM runners to follow sea side of Beach Road to Fritz Sonnenberg on pavement where possible; direct 10KM runners right into Green Point Park."
-263,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Direct 21KM runners to follow sea side of Beach Road to Fritz Sonnenberg on pavement where possible; direct 10KM runners right into Green Point Park."
-264,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Park Road."
-265,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Park Road."
-266,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Bill Peters Road."
-267,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Bill Peters Road."
-268,"AAC","Krishna","Naidoo","Krishna Naidoo","082 325 0756","krishnanaidoo.za@gmail.com","Allan Young","082 259 5713",,"21 & 10","06:51am","08:15am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM runners toward Sea Point on mountain side of Fan Walk. Control cars at parking entrance."
-269,"AAC","Kevin","Kitching","Kevin Kitching","079 618 8190","kevinjk24@gmail.com","Allan Young","082 259 5713",,"21 & 10","06:48am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
-270,"AAC","Nathan","Kitching","Nathan Kitching","072 698 6696","kitching356@gmail.com","Allan Young","082 259 5713",,"21 & 10","06:48am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
-271,"AAC","Brent","Carswell","Brent Carswell","072 548 2085","brent.carswell@gmail.com","Keith Bake","082 259 5713",,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road to Main Road; direct 5KM runners down Vlei Road to finish; keep Vlei Road clear of pedestrians."
-272,"AAC","Clement","Whittle","Clement Whittle","072 616 8891","cg.whittle@gmail.com","Allan Young","082 259 5713",,"21 & 10","07:27am","09:40am","Direct 21KM and 10KM down Beach Road towards Lighthouse."
-273,"AAC","Nicola","Branson","Nicola Branson","082 921 4282","nicola.branson@gmail.com","Allan Young","082 259 5713",,"21 & 10","07:27am","09:40am","Direct 21KM and 10KM down Beach Road towards Lighthouse."
-274,"AAC","Byron","Cowie","Byron Cowie","083 537 6920","byron.cowie14@gmail.com","Allan Young","082 259 5713",,"21 & 10","06:51am","08:15am","Direct 21KM runners to Beach Road on Sea Point side of road; direct 10KM runners to Beach Road on town side of road."
-275,"AAC","Blaise","Makgopa","Blaise Makgopa","072 812 3580","blaise.makgopa@gmail.com","Allan Young","082 259 5713",,"21 & 10","06:51am","08:15am","Direct 21KM runners to Beach Road on Sea Point side of road; direct 10KM runners to Beach Road on town side of road."
-276,"AAC","Jason","Van der Westhuizen","Jason Van der Westhuizen","071 174 7149","jasonwesthuizen@icloud.com","Allan Young","082 259 5713",,"21 & 10","06:51am","08:15am","Direct 21KM runners to Beach Road on Sea Point side of road; direct 10KM runners to Beach Road on town side of road."
-277,"AAC",,,,,,,,,,,,
-278,"AAC",,,,,,,,,,,,
-279,"AAC",,,,,,,,,,,,
-280,"AAC",,,,,,,,,,,,
-281,"AAC",,,,,,,,,,,,
-282,"AAC",,,,,,,,,,,,
-283,"AAC",,,,,,,,,,,,
-284,"AAC",,,,,,,,,,,,
-285,"AAC",,,,,,,,,,,,
-286,"AAC",,,,,,,,,,,,
-287,"AAC",,,,,,,,,,,,
-288,"AAC",,,,,,,,,,,,
-289,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za","21 & 10","06:20am","09:48am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Park Road."
-290,"AAC","Beverley","Delit","Beverley Delit","084 434 1500","beverley@forrent.co.za","Allan Young","082 259 5713",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to U-turn to underpass on sea side of Fan Walk."
-291,"AAC","Jacques","Maree","Jacques Maree","061 135 9300","jacquesmaree1@gmail.com","Allan Young","082 259 5713",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to U-turn to underpass on sea side of Fan Walk."
-292,"AAC","Kaitlin","Byrne","Kaitlin Byrne","082 645 5474","kaitlincarson@gmail.com","Allan Young","082 259 5713",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
-293,"AAC","Eveshen","Ponnusamy","Eveshen Ponnusamy","083 786 2807","eveshen.ponnusamy@gmail.com","Allan Young","082 259 5713",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Refreshment station for 5KM runners only."
-294,"AAC","Shuaib","Loubscher","Shuaib Loubscher","082 728 6645","sloubscher@oldmutual.com","Allan Young","082 259 5713",,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
-295,"AAC","Simon","Wayne","Simon Wayne","076 222 7220","simon.wayne@icloud.com","Allan Young","082 259 5713",,"21,10 & 5","06:42am","09:00am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
-301,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","7:54am","Direct 21KM runners to follow Promenade towards the Lighthouse."
-302,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","7:54am","Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-303,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","7:54am","Direct 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Direct 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-304,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","7:54am","Direct 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Direct 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-305,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","7:54am","Direct 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Direct 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-306,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","7:54am","Direct 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Direct 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-307,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","7:54am","Direct 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Direct 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-308,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","7:54am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-309,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","7:54am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Control traffic on Fort Road."
-310,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","7:54am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-311,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","08:06am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-312,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",21,"06:51am","08:15am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-313,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","08:06am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-314,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from Marine Road and keep 21KM runners in lane closest to median on mountain side of road."
-315,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from Marine Road and keep 21KM runners in lane closest to median on mountain side of road."
-316,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",21,"06:51am","08:06am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-317,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","08:06am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-318,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from Rocklands Road and keep 21KM runners in lane closest to median on mountain side of road."
-319,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from Rocklands Road and keep 21KM runners in lane closest to median on mountain side of road."
-320,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",21,"06:51am","08:15am","Keep 21KM runners on promenade; keep 10KM runners toward Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-321,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",21,"06:51am","08:15am","Keep 21KM runners on promenade; keep 10KM runners toward Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-322,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","08:06am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-323,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from St James Road and keep 21KM runners in lane closest to median on mountain side of road."
-324,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from St James Road and keep 21KM runners in lane closest to median on mountain side of road."
-325,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:06am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
-326,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:06am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
-327,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:06am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
-328,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:06am","Keep 10KM runners in lane closest to the median on sea side of Beach Road toward Camps Bay and lane closest to sea towards town."
-329,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",21,"06:54am","08:27am","Keep 10KM runners in lane closest to the median on sea side of Beach Road toward Camps Bay and lane closest to sea towards town."
-330,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-331,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Marais Road and keep 21KM runners in lane closest to median on mountain side of road."
-332,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Marais Road and keep 21KM runners in lane closest to median on mountain side of road."
-333,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-334,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
-335,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-336,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
-337,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-338,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-339,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",21,"06:54am","08:27am","Keep 21KM runners on the Promenade in the direction of the Lighthouse."
-340,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Worcester Road and keep 21KM runners in lane closest to median on mountain side of road."
-341,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Worcester Road and keep 21KM runners in lane closest to median on mountain side of road."
-342,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-343,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Arthur’s Road and keep 21KM runners in lane closest to median on mountain side of road."
-344,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Arthur’s Road and keep 21KM runners in lane closest to median on mountain side of road."
-345,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:57am","08:30am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
-346,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",21,"07:18am","09:54am","Control traffic coming into to Beach Road from St John’s Road and keep 21KM runners in lane closest to median on mountain side of road."
-347,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:57am","08:30am","Control traffic coming into to Beach Road from St John’s Road and keep 21KM runners in lane closest to median on mountain side of road."
-348,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",21,"06:57am","08:30am","Direct 21KM runners to follow Promenade in direction of Mouille Point and town."
-349,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:57am","08:30am","Turn 21KM runners onto Promenade. Returning 10KM runners to stay in sea side lane of Beach Road."
-350,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:57am","08:30am","Turn 21KM runners onto Promenade. Returning 10KM runners to stay in sea side lane of Beach Road."
-351,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:57am","08:30am","Control traffic coming into to Beach Road from Church Road and keep 21KM runners in lane closest to median on mountain side of road."
-352,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:57am","08:30am","Control traffic coming into to Beach Road from Church Road and keep 21KM runners in lane closest to median on mountain side of road."
-353,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:57am","08:30am","Direct 21KM runners to turn left into Clarens Road; direct incoming 10KM runners across break in median into lane closest to median on mountain side of road."
-354,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:57am","08:30am","Direct 21KM runners to turn left into Clarens Road; direct incoming 10KM runners across break in median into lane closest to median on mountain side of road."
-355,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com","21 & 10","06:57am","08:30am","Direct 21KM runners to turn left into Clarens Road; direct incoming 10KM runners across break in median into lane closest to median on mountain side of road."
-356,"Walmer AC","Wajdi","Kader","Wajdi Kader","0823750395","kadcon.consultants@gmail.com","Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
-357,"Walmer AC","Rashida","Kader","Rashida Kader","0837774747","Rashidakader1411@gmail.com","Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
-358,"Walmer AC","Waseem","Matthews","Waseem Matthews","084 444 3817","waseemct@gmail.com","Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
-359,"Walmer AC","Shaheedah","Ismail","Shaheedah Ismail","0726293913","shaheedahismail@gmail.com","Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
-360,"Walmer AC","Nafeesa","Ismail","Nafeesa Ismail","071 389 3062","nafeesaismail15@gmail.com","Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
-361,"Walmer AC","Rayaan","Williams","Rayaan Williams","0760859303","raywilliamsct@gmail.com","Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
-362,"Walmer AC","Wedaad","Adams","Wedaad Adams","0825755353","naj.physio@gmail.com","Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
-363,"Walmer AC","Najmee","Marlie","Najmee Marlie","0828312799","najmee.marlie@gmail.com","Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Guide the 21KM runners onto Beach Road pavement in direction of Lighthouse."
-364,"Walmer AC","Zaheer","Jacobs","Zaheer Jacobs","083 546 6802","zaheerjac@gmail.com","Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Bill Peters Drive."
-365,"Walmer AC","Imraan","Kahaar","Imraan Kahaar","0826673195","imraankahaar@gmail.com","Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Bill Peters Drive."
-366,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Direct 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
-367,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬","??",21,"07:24am","09:30am","Direct 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
-367,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"07:24am","09:30am","Direct 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
-368,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬","??",21,"06:45am","07:30am","Keep 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
-369,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Direct 21KM runners onto the sea side of Somerset Road; control cars on Chiappini Road."
-370,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Direct 21KM runners onto the sea side of Somerset Road; control cars on Chiappini Road."
-371,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Direct 21KM runners onto the sea side of Somerset Road; control cars on Chiappini Road."
-372,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road; control cars on Alfred Road."
-373,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road; control cars on Alfred Road."
-374,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road."
-375,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road."
-376,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic entering and leaving BP Garage."
-377,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic entering and leaving BP Garage."
-378,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic entering and leaving BP Garage."
-379,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic entering and leaving BP Garage."
-380,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic at parking."
-381,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic at parking."
-382,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Direct runners on to Fan Walk towards the underpass; control cars turning off Somerset Road."
-383,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Direct runners on to Fan Walk towards the underpass; control cars turning off Somerset Road."
-384,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Direct runners on to Fan Walk towards the underpass; control cars at parking."
-385,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,21,"06:45am","07:30am","Direct runners on to Fan Walk towards the underpass; control cars at parking."
-401,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Keep outgoing 10KM runners on the mountain side of Beach Road towards Camps Bay."
-402,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Keep outgoing 10KM runners on the mountain side of Beach Road towards Camps Bay."
-403,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Guide returning 10KM runners to the sea side lane closest to pools."
-404,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za","21 & 10","07:18am","10:06am","Guide 21KM runners onto the pavement; keep 10KM runners on the road."
-405,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Keep 10KM runners on Beach Road towards Camps Bay."
-406,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Control traffic coming into to Beach Road from St Andrew’s Road and keep 10KM runners on Beach Road towards Camps Bay."
-407,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Control traffic coming into to Beach Road from St Andrew’s Road and keep 10KM runners on Beach Road towards Camps Bay."
-408,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Keep 10KM runners on Beach Road towards Camps Bay."
-409,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Keep 10KM runners on Beach Road towards Camps Bay; keep runners off the slip road."
-410,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Control traffic coming into to Beach Road from Solomons Road and keep 10KM runners on Beach Road towards Camps Bay."
-411,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Control traffic coming into to Beach Road from Solomons Road and keep 10KM runners on Beach Road towards Camps Bay."
-412,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Turn 10KM runners towards the Queen’s Road circle and back on to Beach Road along the sea towards town."
-413,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",10,"07:45am","08:15am","Turn 10KM runners towards the Queen’s Road circle and back on to Beach Road along the sea towards town."
-414,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za","21 & 10","07:18am","09:54am","Turn 10KM runners back on to mountain side of Beach Road along the sea towards town."
-415,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Guide 21KM around the circle onto the sea side of Beach Road towards town."
-416,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Guide 21KM around the circle onto the sea side of Beach Road towards town; control traffic entering Beach Road in the direction of Camps Bay."
-417,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; keep 10KM in mountain side lane towards town."
-418,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za","21 & 10","07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; keep 10KM in mountain side lane towards town."
-419,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za","21 & 10","07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; keep 10KM in mountain side lane towards town."
-420,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za","21 & 10","07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; keep 10KM in mountain side lane towards town."
-421,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za","21 & 10","07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; keep 10KM in mountain side lane towards town."
-422,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Control traffic coming into Queen’s Road towards the circle."
-423,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Control traffic coming into Queen’s Road towards the circle."
-424,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Control traffic coming into Queen’s Road towards the circle."
-425,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; control traffic in the mountain side lane."
-426,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; control traffic in the mountain side lane."
-427,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town."
-428,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town."
-429,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town."
-430,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town."
-431,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Turn 21KM runners off Victoria Road and down Seacliffe Road."
-432,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Turn 21KM runners off Victoria Road and down Seacliffe Road."
-433,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Turn 21KM runners off Victoria Road and down Seacliffe Road."
-434,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-435,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-436,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-437,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-438,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-439,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-440,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-441,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-442,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-443,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-444,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-445,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:45am","07:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-446,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:45am","07:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-447,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-448,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-449,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-450,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-451,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-452,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-453,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-454,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-455,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-456,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-457,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-458,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-459,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-460,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-461,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-462,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-463,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-464,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-465,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-466,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-467,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-468,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-469,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-470,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-471,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-472,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-473,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-474,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-475,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-476,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-477,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-478,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-479,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-480,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-481,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
-482,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-483,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-484,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-485,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-486,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-487,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
-488,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Turn 21KM runners on to Victoria Road towards town; control traffic as they cross. Victoria Road is open to traffic in both directions."
-490,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Turn runners onto Victoria Road in direction of City Centre - control traffic coming from Clifton. This side of the road is open to traffic."
-490,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Turn 21KM runners on to Victoria Road towards town; control traffic as they cross. Victoria Road is open to traffic in both directions."
-491,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Turn runners onto Victoria Road in direction of City Centre - control traffic coming from Clifton. This side of the road is open to traffic."
-491,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Turn 21KM runners on to Victoria Road towards town; control traffic as they cross. Victoria Road is open to traffic in both directions."
-501,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Control traffic as 21KM runners cross Regent Road on Clarens Road."
-502,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Control traffic as 21KM runners cross Regent Road on Clarens Road."
-503,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Turn runners off Clarens Road on to the sea side lane of Kloof Road; Kloof Road is open to traffic towards town."
-504,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-505,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-506,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-507,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); control traffic on Kei Apple Road. Kloof Road is open to traffic towards town."
-508,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-509,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-510,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); control traffic on Quendon Road. Kloof Road is open to traffic towards town."
-511,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-512,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-513,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-514,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); control traffic on Kings Road. Kloof Road is open to traffic towards town."
-515,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-516,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-517,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); control traffic on Queens Road. Kloof Road is open to traffic towards town."
-518,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-519,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); control traffic on Fir Avenue. Kloof Road is open to traffic towards town."
-520,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-521,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-522,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-523,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-524,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-525,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-526,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-527,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-528,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-529,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-530,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-531,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-532,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-533,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-534,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-535,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-536,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-537,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-538,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-539,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-540,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-541,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-542,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-543,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-544,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-545,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-546,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-547,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-548,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-549,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-550,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-551,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-552,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-553,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-554,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-555,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-556,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-557,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-558,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-559,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-560,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-561,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-562,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Turn runners onto Victoria Road towards town; control traffic as runners cross. Victoria Road is open to traffic in both directions."
-563,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Turn runners onto Victoria Road towards town; control traffic as runners cross. Victoria Road is open to traffic in both directions."
-564,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Turn runners onto Victoria Road towards town; control traffic as runners cross. Victoria Road is open to traffic in both directions."
-565,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-566,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-567,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-568,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-569,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-570,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-571,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-572,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-573,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-574,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-575,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-576,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
-577,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+"position","club","firstname","surname","name","phone","email","captain","captain_phone","captain_email","days","races","first_runner","last_runner","instructions"
+101,"AAC","Darawees","Gasant","Darawees Gasant","078 192 7349","darawees@webmail.co.za","William van Dugteren","082 774 1980",,2,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
+102,"AAC","Lynn","Davis","Lynn Davis","082 999 0333","lynncatherinedavis@gmail.com","William van Dugteren","082 774 1980",,2,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
+103,"AAC","Cido","Yildez","Cido Yildez","0825937464","cido.yildiz@gmail.com","William van Dugteren","082 774 1980",,2,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
+104,"AAC","Gabiba","Talip","Gabiba Talip","083 477 1773","gabiba@mweb.co.za","William van Dugteren","082 774 1980",,2,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
+105,"AAC","John","Damata","John Damata","073 966 6005","wtffor@gmail.com","William van Dugteren","082 774 1980",,2,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
+106,"AAC","Sonja","Damata","Sonja Damata","082 809 7788","srdamata@gmail.com","William van Dugteren","082 774 1980",,2,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
+107,"AAC","Khalied","Hanslo","Khalied Hanslo","083 285 5941","hansolo786@gmail.com","William van Dugteren","082 774 1980",,2,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
+108,"AAC","Wasielah","Adams","Wasielah Adams","082 931 4762","wasiadams@hotmail.com","William van Dugteren","082 774 1980",,2,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
+109,"AAC","Fareed","Adams","Fareed Adams","076 094 5128","gabiba@mweb.co.za","William van Dugteren","082 774 1980",,2,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45."
+110,"AAC","Michelle","Cupido","Michelle Cupido","083 430 2844","michellekippie289@gmail.com","William van Dugteren","082 774 1980",,2,"21,10 & 5","04:45am","8:30am","Assist with setup at start and moving of pens between races. Prevent runners from entering pens for which they are not seeded. Note that you should be in position by 4:45. Once the races have started, control cars at club entrance."
+111,"AAC","Mick","Murphy","Mick Murphy","084 529 0967","mick@murphyprojects.co.za","Keith Bake","083 245 8757",,2,"21 & 5","08:30am","8:45am","Direct 5KM race up Beach Road towards the Dock Road circle. Prevent cars from accessing Beach Road from Haul Road."
+112,"AAC","Gill","Smalberger","Gill Smalberger","072 348 3615","smally@intekom.co.za","Keith Bake","083 245 8757",,2,"21 & 10","06:30am","07:35am","Control cars at hotel entrance."
+113,"AAC","Tracey","Ellis","Tracey Ellis","082 486 0300","tracey.smalberger@za.ey.com","Keith Bake","083 245 8757",,2,"21 & 10","06:30am","07:35am","Control cars at club entrance."
+114,"AAC","Dave","Bywater","Dave Bywater","083 500 0845","davidbywater845@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:36am","06:50am","Direct 21KM runners from Granger Bay Boulevard on to Dock Road on the mountain side of the island."
+115,"AAC","Tissa","Fuchsloch","Tissa Fuchsloch","082 907 7234","tissa.fuchsloch@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:36am","06:50am","Direct 21KM runners from Granger Bay Boulevard on to Dock Road on the mountain side of the island."
+116,"AAC","Elizabeth","McGeever","Elizabeth McGeever","084 621 7066","emcgeever@waterfront.co.za","Stephanie Donachie","061 365 1127",,2,21,"06:36am","06:50am","Direct 21KM runners from Granger Bay Boulevard on to Dock Road on the mountain side of the island."
+117,"AAC","Kim","Botti","Kim Botti","082 520 6125","kimb@leebotti.co.za","Jarrod Assenheim","082 443 3209",,2,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
+118,"AAC","Mick","Murphy","Mick Murphy","084 529 0967","mick@murphyprojects.co.za","Stephanie Donachie","061 365 1127",,2,"21 & 5","06:36am","08:45am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+119,"AAC","Odette","Geldenhuys","Odette Geldenhuys","083 776 6611","odette.g@mweb.co.za","Stephanie Donachie","061 365 1127",,2,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+120,"AAC","Lawrence","Swanson","Lawrence Swanson","083 389 2604","lawrences@afreshbrands.co.za","Stephanie Donachie","061 365 1127",,2,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+121,"AAC","Susan","Winckworth","Susan Winckworth","072 240 5485","winckworthsusan@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+122,"AAC","Kerry","Jack","Kerry Jack","082 782 7297","kerryjackbloodstock@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+123,"AAC","Lindsay","Dentlinger","Lindsay Dentlinger","074 101 2899","lindsaydentlinger@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+124,"AAC","Byron","Rode","Byron Rode","084 874 5650","byronrode@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+125,"AAC","Andre","Senremo","Andre Senremo","060 495 1173","atkleinsmith@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:36am","06:50am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+126,"AAC","Anne","Zimmerman","Anne Zimmerman","083 384 1730","anne.zimmerman@foord.co.za","Stephanie Donachie","061 365 1127",,2,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+127,"AAC","Howard","Silke","Howard Silke","083 557 5840","howard.silke@bassgordon.co.za","Stephanie Donachie","061 365 1127",,2,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+128,"AAC","Michael","Eastman","Michael Eastman","082 907 7246","asics@iafrica.com","Stephanie Donachie","061 365 1127",,2,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+129,"AAC","Shen","Eastman","Shen Eastman","082 907 7246","asics@iafrica.com","Stephanie Donachie","061 365 1127",,2,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+130,"AAC","Jana","van Houwelingen","Jana van Houwelingen","082 874 3839","janavh04@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+131,"AAC","Nazeem","Hendricks","Nazeem Hendricks","071 866 0481","nazeemhendricks@icloud.com","Stephanie Donachie","061 365 1127",,2,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+132,"AAC","Marisa","Smalberger","Marisa Smalberger","083 408 3371","marisa.smalberger@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+133,"AAC","Brenda","Pringle","Brenda Pringle","083 658 2179","brenda.pringle@commsure.co.za","Stephanie Donachie","061 365 1127",,2,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+134,"AAC","Lisa","Pringle","Lisa Pringle","083 650 4625","lisakpringle@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:39am","07:00am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+135,"AAC","Gloria","Chitedze","Gloria Chitedze","061 414 6665","gloriachitedze@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:42am","07:10am","Keep 21KM on the mountain side of the road; sea side will be open to cars."
+136,"AAC","Max","Wimmer","Max Wimmer","082 669 9993","maxwimmerct@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:42am","07:10am","Direct runners towards Ebenezer Road on inside of traffic circle; control cars on sea side of road/traffic circle."
+137,"AAC","Elizna","Read","Elizna Read","084 922 1122","elizna.read@pbtgroup.co.za","Stephanie Donachie","061 365 1127",,2,21,"06:42am","07:10am","Direct runners towards Ebenezer Road on inside of traffic circle; control cars on sea side of road/traffic circle."
+138,"AAC","Lloyd","Goliath","Lloyd Goliath","082 387 0732","lloydgoliath@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:42am","07:10am","Direct runners towards Ebenezer Road on inside of traffic circle; control cars on sea side of road/traffic circle."
+139,"AAC","Sheffield","Wakefield","Sheffield Wakefield","083 450 0468","sheffieldwakefield@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:42am","07:10am","Direct runners towards Ebenezer Road on inside of traffic circle; control cars on sea side of road/traffic circle."
+140,"AAC","Elzahn","Oosthuizen","Elzahn Oosthuizen","083 236 2399","elzahno@gmail.com","Stephanie Donachie","061 365 1127",,2,21,"06:42am","07:10am","Direct runners up Ebenezer Road on Sea Point side of road; control cars at Port Road."
+141,"AAC","Bridget","Sherman","Bridget Sherman","072 424 6233","bridgetsherman24@gmail.com","Collin Sedeman","083 540 3252",,2,21,"06:42am","07:10am","Direct runners on to Prestwich Street on mountain side of road; control cars."
+142,"AAC","Lindsay","Evard","Lindsay Evard","083 677 6647","Lindsay.evard@aig.com","Collin Sedeman","083 540 3252",,2,21,"06:45am","07:20am","Direct runners on to Fan Walk towards the underpass; control cars turning off Somerset Road."
+143,"AAC","Stephen","Seymour","Stephen Seymour","072 142 1013","steve.seymour161@gmail.com","Collin Sedeman","083 540 3252",,2,21,"06:45am","07:20am","Direct runners on to Fan Walk towards the underpass; control cars turning off Somerset Road."
+144,"AAC","Caroline","Balkwill","Caroline Balkwill","072 992 5115","caroline@coricraft.co.za","Collin Sedeman","083 540 3252",,2,21,"06:45am","07:20am","Keep runners on Fan Walk towards the underpass."
+145,"AAC","Carl","Ronander","Carl Ronander","071 673 6005","Carl@shimansky.co.za","Collin Sedeman","083 540 3252",,2,"21 & 5","06:45am","07:20am","Keep runners on Fan Walk towards the underpass."
+146,"AAC","Jeff","Singer","Jeff Singer","083 254 5535","jeff@rbs.co.za","Collin Sedeman","083 540 3252",,2,21,"06:42am","07:10am","Direct runners on to Prestwich Street on mountain side of road; control cars."
+147,"AAC","Marc","Cohen","Marc Cohen","083 675 3545","marc@cohen.co.za","Collin Sedeman","083 540 3252",,2,21,"06:42am","07:10am","Direct runners on to Prestwich Street on mountain side of road; control cars."
+148,"AAC","Tamryn","West","Tamryn West","072 589 1331","tamrynwest06@gmail.com","Jarrod Assenheim","082 443 3209",,2,"21 & 5","06:36am","08:45am","Keep 21KM on the Sea Point side of the road towards the Waterfront; keep the 5KM on the Sea Point side of the road towards Fritz Sonnenberg Road."
+149,"AAC","Luke","Serafin","Luke Serafin","079 890 0094","lukebrian.serafin@gmail.com","Jarrod Assenheim","082 443 3209",,2,"21 & 5","06:36am","08:45am","Keep 21KM on the Sea Point side of the road towards the Waterfront; keep the 5KM on the Sea Point side of the road towards Fritz Sonnenberg Road."
+150,"AAC","Gerald","Aronson","Gerald Aronson","082 569 5627","klik@mweb.co.za","Jarrod Assenheim","082 443 3209",,2,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
+151,"AAC","Ben","Gillies","Ben Gillies","082 648 8285","gillies.ben@gmail.com","Jarrod Assenheim","082 443 3209",,2,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
+152,"AAC","Maria","Lewis","Maria Lewis","060 683 6012","gabiba@mweb.co.za","Jarrod Assenheim","082 443 3209",,2,"21 & 5","06:36am","08:45am","Direct 21KM from Granger Bay Blvd around the circle and down Dock Road on the Sea Point side of the road; direct 5KM race up Granger Bay Blvd on the Sea Point side of the road."
+201,"AAC","Eduan","Coetzee","Eduan Coetzee","071 257 9565","ecoetzee920827@gmail.com","Collin Sedeman","083 540 3252",,2,"21 & 5","06:48am","09:06am","Keep runners on Fan Walk towards the underpass; keep Fan Walk clear of cars; direct returning 5KM runners through the parking lot."
+202,"AAC","Robert","Zive","Robert Zive","083 700 7838","Rzive@snoekws.co.za","Collin Sedeman","083 540 3252",,2,"21 & 5","06:48am","09:06am","Keep runners on Fan Walk towards the underpass; keep Fan Walk clear of cars; direct returning 5KM runners through the parking lot."
+203,"AAC","Melissa","Weber","Melissa Weber","072 249 7297","melissadweber@gmail.com","Collin Sedeman","083 540 3252",,2,"21 & 5","06:48am","09:06am","Direct 21KM runners into underpass; keep outgoing 5KM runners on sea side of Fan Walk and direct returning 5KM runners through the parking lot."
+204,"AAC","Prieur","du Plessis","Prieur du Plessis","072 189 7900","prieur@gmail.com","Jarrod Assenheim","082 443 3209",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM and returning 5KM runners through underpass and out towards Fan Walk along Main Road."
+205,"AAC","Simon","Midgley","Simon Midgley","083 957 0150","simon.midgley101@gmail.com","Jarrod Assenheim","082 443 3209",,2,"21,10 & 5","06:48am","09:30am","Direct incoming 5KM runners out underpass on sea side of Fan Walk towards town; direct returning 21KM and 5KM runners through underpass and out towards Fan Walk along Main Road."
+206,"AAC","Gretchen","Weber","Gretchen Weber","072 340 9074","Gretchen.weber91@gmail.com","Jarrod Assenheim","082 443 3209",,2,"21,10 & 5","06:48am","09:30am","Direct incoming 5KM runners into underpass and out towards sea side of Fan Walk along Main Road."
+207,"AAC","James","Willis","James Willis","083 306 7807","james@moresport.co.za","Jarrod Assenheim","082 443 3209",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM and 10KM runners out of underpass towards Sea Point along Fan Walk on Main Road; direct returning 5KM runners on to Forecourt towards Sea Point."
+208,"AAC","Comfort","Bunting","Comfort Bunting","082 441 9955","hlupheka@hotmail.com","Jarrod Assenheim","082 443 3209",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
+209,"AAC","Basil","Mashappie","Basil Mashappie","079 490 4329","bmashappie@parliament.gov.za","Jarrod Assenheim","082 443 3209",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
+210,"AAC","Claire","van den Heever","Claire van den Heever","079 324 6787","clairevdh@gmail.com","Jarrod Assenheim","082 443 3209",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
+211,"AAC","Iain","Manley","Iain Manley","081 868 0197","iain@voicemap.me","Jarrod Assenheim","082 443 3209",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
+212,"AAC","Rachel","Marks","Rachel Marks","081 476 8247","rachmarks@hotmail.com","Collin Sedeman","083 540 3252",,2,"21 & 5","06:48am","09:06am","Turn 5KM runners around back towards Sea Point from sea side to mountainside of Fan Walk; direct 21KM runners towards Sea Point on Fan Walk."
+213,"AAC","John","Kolbe","John Kolbe","071 231 6940","kolbejon@gmail.com","Collin Sedeman","083 540 3252",,2,"21 & 5","06:48am","09:06am","Turn 5KM runners around back towards Sea Point from sea side to mountainside of Fan Walk; direct 21KM runners towards Sea Point on Fan Walk."
+214,"AAC","Barney ","Israells","Barney Israells","082 874 3839","barney@vegtech.co.za","Jarrod Assenheim","082 443 3209",,2,"21 & 5","06:36am","09:00am","Direct 21KM from Fritz Sonnenberg down Granger Bay Blvd on stadium side of road; direct 5KM to turn into Fritz Sonnenberg towards stadium."
+215,"AAC","Kobus","Ehlers","Kobus Ehlers","073 188 6583","kobus@kobusehlers.com","Jarrod Assenheim","082 443 3209",,2,"21 & 5","06:36am","09:00am","Direct 21KM from Fritz Sonnenberg down Granger Bay Blvd on stadium side of road; direct 5KM to turn into Fritz Sonnenberg towards stadium."
+216,"AAC","Sarietha","Engelbrecht","Sarietha Engelbrecht","082 567 7772","sarietha.engelbrecht@gmail.com","Jarrod Assenheim","082 443 3209",,2,"21 & 5","06:36am","09:00am","Direct 21KM from Fritz Sonnenberg down Granger Bay Blvd on stadium side of road; direct 5KM to turn into Fritz Sonnenberg towards stadium."
+217,"AAC","Cindy","Albertyn","Cindy Albertyn","072 574 9034","cindy.albertyn@gmail.com","Keith Bake","083 245 8757",,2,"21 & 5","06:36am","09:40am","Direct 21KM runners from Forecourt to Fritz Sonnenberg towards Granger Bay Boulevard; direct 5KM from Fritz Sonnenberg on to Forecourt."
+218,"AAC","Rene","Albertyn","Rene Albertyn","079 803 6080","rene.albertyn@gmail.com","Keith Bake","083 245 8757",,2,"21 & 5","06:36am","08:48am","Direct 21KM runners from Forecourt towards Fritz Sonnenberg; after last 21KM runner, lay out cones to direct 5KM from Fritz Sonnenberg on a hard right towards the underpass, and direct 5KM the same way yourself."
+219,"AAC","Matthew","Welz","Matthew Welz","083 791 1332","mfwelz@gmail.com","Keith Bake","083 245 8757",,2,"21,10 & 5","06:36am","09:40am","Direct 21KM runners across Forecourt towards stadium; direct 10KM runners to underpass; direct 5KM runners towards Sea Point and finish field."
+220,"AAC","Jarryd","Phillips","Jarryd Phillips","079 733 7249","jarryd@teamphillips.co.za","Keith Bake","083 245 8757",,2,"10 & 5","07:33am","09:40am","Direct 21KM runners across Forecourt towards stadium; direct 10KM runners to underpass; direct 5KM runners towards Sea Point and finish field."
+221,"AAC","Brendon","van Niekerk","Brendon van Niekerk","082 680 6762","brendon.van.niekerk@gmail.com","Allan Young","082 259 5713",,2,"21,10 & 5","06:48am","09:00am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
+222,"AAC","Brian","Hoskin","Brian Hoskin","071 373 1771","brian@hosking.co.za","Allan Young","082 259 5713",,2,"21,10 & 5","06:48am","09:00am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
+223,"AAC","Stacey","Hardy","Stacey Hardy","076 639 1706","stacey.rethman@gmail.com","Allan Young","082 259 5713",,2,"21 & 10","06:51am","09:00am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM toward Sea Point on Fan Walk. Control cars at parking entrance."
+224,"AAC","Brandon","Moulder","Brandon Moulder","083 643 2087","brandonmoulder@gmail.com","Allan Young","082 259 5713",,2,"21 & 10","06:48am","09:00am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM toward Sea Point on Fan Walk. Control cars at parking entrance."
+225,"AAC","Nicole","Swanson","Nicole Swanson","083 273 8190","nicoles@afreshbrands.co.za","Keith Bake","083 245 8757",,2,"21 & 10","06:33am","07:33am","Direct 21KM and 10KM runners down Vlei Road. Control pedestrians across Vlei Road."
+226,"AAC","Stephen","Swanson","Stephen Swanson","021 531 3713","stephens@afreshbrands.co.za","Keith Bake","083 245 8757",,2,"21 & 10","06:33am","07:33am","Direct 21KM and 10KM runners down Vlei Road. Control pedestrians across Vlei Road."
+227,"AAC","Elisha","Berridge","Elisha Berridge","083 453 2739","elishaberridge@gmail.com","Keith Bake","083 245 8757",,2,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM runners at start down town side of Fritz Sonnenberg; direct finishing 21KM runners down Sea Point side of Fritz Sonnenberg."
+228,"AAC","Dempsey","Wallansan","Dempsey Wallansan","076 9319806","AFRILOGISTICS@TELKOMSA.NET","Keith Bake","083 245 8757",,2,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM runners at start down town side of Fritz Sonnenberg; direct finishing 21KM runners down Sea Point side of Fritz Sonnenberg."
+229,"AAC","Ilan","Russon","Ilan Russon","082 884 3250","ilanrusson@gmail.com","Keith Bake","083 245 8757",,2,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM runners at start down town side of Fritz Sonnenberg; direct finishing 21KM runners down Sea Point side of Fritz Sonnenberg."
+230,"AAC","Alexandra","Willis-Smith","Alexandra Willis-Smith","073 757 9085","willissmitha@gmail.com","Keith Bake","083 245 8757",,2,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM runners down Fritz Sonnenberg; keep 10KM runners on town side; control cars at entrance to Golf Club and prevent cars driving towards stadium."
+231,"AAC","Daniel","Eigelaar","Daniel Eigelaar","073 792 6524","daniel.eigelaar@gmail.com","Keith Bake","083 245 8757",,2,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM runners down Fritz Sonnenberg; keep 10KM runners on town side; control cars at Bay Road and prevent cars driving towards stadium."
+232,"AAC","David","Frylinck","David Frylinck","084 387 5348","david.frylinck@gmail.com","Keith Bake","083 245 8757",,2,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM from start down Fritz Sonnenberg past stadium; direct 21KM finishers into Stephan Way towards Hamilton."
+233,"AAC","Nienke","Pannekoek","Nienke Pannekoek","066 156 5153","nienkepannekoek@hotmail.com","Keith Bake","083 245 8757",,2,"10 & 21","06:30am","10:00am","Direct 21KM and 10KM from start down Fritz Sonnenberg past stadium; direct 21KM finishers into Stephan Way towards Hamilton."
+234,"AAC","Nthabeleng","Tsusane","Nthabeleng Tsusane","082 381 9923","otsusane@gmail.com","Keith Bake","083 245 8757",,2,21,"07:36am","10:00am","Direct 21KM down Stephan Way on to fields; control car access to Hamilton."
+235,"AAC","Desmond","Judge","Desmond Judge","082 492 1015","desmond@mjudge.co.za","Keith Bake","083 245 8757",,2,21,"07:36am","10:00am","Direct 21KM towards finish on fields."
+236,"AAC","Tim","Siebritz","Tim Siebritz","076 679 161","tsiebritz@gmail.com","Allan Young","082 259 5713",,2,"21,10 & 5","06:36am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
+237,"AAC","Sherri","Liss","Sherri Liss","083 859 0234","shrrliss@gmail.com","Allan Young","082 259 5713",,2,"21,10 & 5","06:48am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
+238,"AAC","Melvyn","Office","Melvyn Office","073 898 9386","melvyn.office@gmail.com","Keith Bake","083 245 8757",,2,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road; keep Vlei Road clear of pedestrians for 5KM runners."
+239,"AAC","Kylie","Hoffman","Kylie Hoffman","083 643 3831","kylzie@gmail.com","Keith Bake","083 245 8757",,2,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road to Main Road; direct 5KM runners down Vlei Road to finish; keep Vlei Road clear of pedestrians."
+240,"AAC","Caspar","Greef","Caspar Greef","082 456 4054","greeff@adept.co.za","Keith Bake","083 245 8757",,2,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road to Main Road; direct 5KM runners down Vlei Road to finish; keep Vlei Road clear of pedestrians."
+241,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Direct 21KM runners to follow Beach Road to Fritz Sonnenberg; direct 10KM runners right into Green Point Park."
+242,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Direct 21KM runners to follow Beach Road to Fritz Sonnenberg; direct 10KM runners right into Green Point Park."
+243,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,10,"07:55am","09:30am","Keep 10KM Runners on town side of path through the park and pedestrians on the Sea Point side."
+244,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,10,"07:57am","09:30am","Control traffic on Bay Road allowing runners to cross into park and traffic to flow when there is the opportunity to let them pass."
+245,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,10,"07:57am","09:30am","Control traffic on Bay Road allowing runners to cross into park and traffic to flow when there is the opportunity to let them pass."
+246,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,10,"07:57am","09:30am","Keep 10KM runners on town side of path through the park and pedestrians on the Sea Point side."
+247,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,10,"07:57am","09:30am","Keep 10KM runners on town side of path through the park and pedestrians on the Sea Point side."
+248,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,10,"07:57am","09:30am","Keep 10KM runners on town side of path through the park and pedestrians on the Sea Point side."
+249,"AAC","Preggy","Moonsammy","Preggy Moonsammy","076 552 7003","Preggy.Moonsamy@netcare.co.za","Keith Bake","083 245 8757",,2,10,"07:42am","09:10am","Direct 10KM finishers out of park and into finish field through gate."
+250,"AAC","Carla","Jacobus","Carla Jacobus","082 059 5125","carlaj@robben-island.org.za","Keith Bake","083 245 8757",,2,10,"07:42am","09:10am","Direct 10KM finishers towards finish."
+251,"AAC","Sibulelo","Mayekiso","Sibulelo Mayekiso","078 473 5651","sibulelo.mayekiso@gmail.com","Collin Sedeman","083 540 3252",,2,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars at Bennett Road."
+252,"AAC","Caryn","Querido","Caryn Querido","074 457 9582","carrie.querido@gmail.com","Collin Sedeman","083 540 3252",,2,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Napier Road."
+253,"AAC","Devyn","Lee","Devyn Lee","076 819 1127","leedevyn355@gmail.com","Collin Sedeman","083 540 3252",,2,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Napier Road."
+254,"AAC","Melville","Silke","Melville Silke","072 132 5572","melville.silke@gmail.com","Collin Sedeman","083 540 3252",,2,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Alfred Road."
+255,"AAC","Patrick","Willenberg","Patrick Willenberg","071 231 6940","kolbejon@gmail.com","Collin Sedeman","083 540 3252",,2,21,"06:42am","07:20am","Direct 21KM runners along the mountain side of the road; control cars on Alfred Road."
+256,"AAC","JP","Moodie","JP Moodie","083 999 3735","za.jeanpaul@gmail.com","Collin Sedeman","083 540 3252",,2,21,"06:45am","07:20am","Direct 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
+257,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,21,"06:25am","10:00am","Keep 21KM runners to sea side of Beach Road and on pavement when possible."
+258,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,21,"06:25am","10:00am","Control traffic at junction of Beach and Rothsay Place. Keep 21KM runners to sea side of Beach Road and on pavement when possible."
+259,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,21,"06:25am","10:00am","Control traffic at junction of Beach and Rothsay Place. Keep 21KM runners to sea side of Beach Road and on pavement when possible."
+260,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Keep 21KM runners on sea side of Beach Road and on pavement when possible; direct 10KM runners right into Green Point Park."
+261,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Direct 21KM runners to follow Beach Road to Fritz Sonnenberg; direct 10KM runners right into Green Point Park."
+262,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Direct 21KM runners to follow sea side of Beach Road to Fritz Sonnenberg on pavement where possible; direct 10KM runners right into Green Point Park."
+263,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Direct 21KM runners to follow sea side of Beach Road to Fritz Sonnenberg on pavement where possible; direct 10KM runners right into Green Point Park."
+264,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Park Road."
+265,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Park Road."
+266,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Bill Peters Road."
+267,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Bill Peters Road."
+268,"AAC","Krishna","Naidoo","Krishna Naidoo","082 325 0756","krishnanaidoo.za@gmail.com","Allan Young","082 259 5713",,2,"21 & 10","06:51am","08:15am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM runners toward Sea Point on mountain side of Fan Walk. Control cars at parking entrance."
+269,"AAC","Kevin","Kitching","Kevin Kitching","079 618 8190","kevinjk24@gmail.com","Allan Young","082 259 5713",,2,"21 & 10","06:48am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
+270,"AAC","Nathan","Kitching","Nathan Kitching","072 698 6696","kitching356@gmail.com","Allan Young","082 259 5713",,2,"21 & 10","06:48am","09:40am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
+271,"AAC","Brent","Carswell","Brent Carswell","072 548 2085","brent.carswell@gmail.com","Keith Bake","082 259 5713",,2,"21,10 & 5","06:33am","10:00am","Direct 21KM and 10KM runners up Vlei Road to Main Road; direct 5KM runners down Vlei Road to finish; keep Vlei Road clear of pedestrians."
+272,"AAC","Clement","Whittle","Clement Whittle","072 616 8891","cg.whittle@gmail.com","Allan Young","082 259 5713",,2,"21 & 10","07:27am","09:40am","Direct 21KM and 10KM down Beach Road towards Lighthouse."
+273,"AAC","Nicola","Branson","Nicola Branson","082 921 4282","nicola.branson@gmail.com","Allan Young","082 259 5713",,2,"21 & 10","07:27am","09:40am","Direct 21KM and 10KM down Beach Road towards Lighthouse."
+274,"AAC","Byron","Cowie","Byron Cowie","083 537 6920","byron.cowie14@gmail.com","Allan Young","082 259 5713",,2,"21 & 10","06:51am","08:15am","Direct 21KM runners to Beach Road on Sea Point side of road; direct 10KM runners to Beach Road on town side of road."
+275,"AAC","Blaise","Makgopa","Blaise Makgopa","072 812 3580","blaise.makgopa@gmail.com","Allan Young","082 259 5713",,2,"21 & 10","06:51am","08:15am","Direct 21KM runners to Beach Road on Sea Point side of road; direct 10KM runners to Beach Road on town side of road."
+276,"AAC","Jason","Van der Westhuizen","Jason Van der Westhuizen","071 174 7149","jasonwesthuizen@icloud.com","Allan Young","082 259 5713",,2,"21 & 10","06:51am","08:15am","Direct 21KM runners to Beach Road on Sea Point side of road; direct 10KM runners to Beach Road on town side of road."
+277,"AAC",,,,,,,,,2,,,,
+278,"AAC",,,,,,,,,2,,,,
+279,"AAC",,,,,,,,,2,,,,
+280,"AAC",,,,,,,,,2,,,,
+281,"AAC",,,,,,,,,2,,,,
+282,"AAC",,,,,,,,,2,,,,
+283,"AAC",,,,,,,,,2,,,,
+284,"AAC",,,,,,,,,2,,,,
+285,"AAC",,,,,,,,,2,,,,
+286,"AAC",,,,,,,,,2,,,,
+287,"AAC",,,,,,,,,2,,,,
+288,"AAC",,,,,,,,,2,,,,
+289,"Edgemead Runners",,,,,,"Liam Hendrickse","072 392 7558","raceconvener@edgemeadrunners.org.za",2,"21 & 10","06:20am","09:48am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Park Road."
+290,"AAC","Beverley","Delit","Beverley Delit","084 434 1500","beverley@forrent.co.za","Allan Young","082 259 5713",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to U-turn to underpass on sea side of Fan Walk."
+291,"AAC","Jacques","Maree","Jacques Maree","061 135 9300","jacquesmaree1@gmail.com","Allan Young","082 259 5713",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to U-turn to underpass on sea side of Fan Walk."
+292,"AAC","Kaitlin","Byrne","Kaitlin Byrne","082 645 5474","kaitlincarson@gmail.com","Allan Young","082 259 5713",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
+293,"AAC","Eveshen","Ponnusamy","Eveshen Ponnusamy","083 786 2807","eveshen.ponnusamy@gmail.com","Allan Young","082 259 5713",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Refreshment station for 5KM runners only."
+294,"AAC","Shuaib","Loubscher","Shuaib Loubscher","082 728 6645","sloubscher@oldmutual.com","Allan Young","082 259 5713",,2,"21,10 & 5","06:48am","09:30am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk."
+295,"AAC","Simon","Wayne","Simon Wayne","076 222 7220","simon.wayne@icloud.com","Allan Young","082 259 5713",,2,"21,10 & 5","06:42am","09:00am","Direct 21KM runners towards Sea Point on sea side lane of Main Road; direct 10KM and 5KM runners toward Sea Point on mountain side of Fan Walk; direct returning 5KM runners to underpass on sea side of Fan Walk. Control cars at parking entrance."
+301,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","7:54am","Direct 21KM runners to follow Promenade towards the Lighthouse."
+302,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","7:54am","Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+303,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","7:54am","Direct 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Direct 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+304,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","7:54am","Direct 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Direct 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+305,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","7:54am","Direct 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Direct 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+306,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","7:54am","Direct 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Direct 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+307,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","7:54am","Direct 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Direct 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+308,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","7:54am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+309,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","7:54am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Control traffic on Fort Road."
+310,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","7:54am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+311,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","08:06am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+312,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,21,"06:51am","08:15am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+313,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","08:06am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+314,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from Marine Road and keep 21KM runners in lane closest to median on mountain side of road."
+315,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from Marine Road and keep 21KM runners in lane closest to median on mountain side of road."
+316,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,21,"06:51am","08:06am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+317,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","08:06am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+318,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from Rocklands Road and keep 21KM runners in lane closest to median on mountain side of road."
+319,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from Rocklands Road and keep 21KM runners in lane closest to median on mountain side of road."
+320,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,21,"06:51am","08:15am","Keep 21KM runners on promenade; keep 10KM runners toward Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+321,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,21,"06:51am","08:15am","Keep 21KM runners on promenade; keep 10KM runners toward Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+322,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","08:06am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+323,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from St James Road and keep 21KM runners in lane closest to median on mountain side of road."
+324,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:51am","08:06am","Control traffic coming into to Beach Road from St James Road and keep 21KM runners in lane closest to median on mountain side of road."
+325,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:06am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
+326,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:06am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
+327,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:06am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
+328,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:06am","Keep 10KM runners in lane closest to the median on sea side of Beach Road toward Camps Bay and lane closest to sea towards town."
+329,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,21,"06:54am","08:27am","Keep 10KM runners in lane closest to the median on sea side of Beach Road toward Camps Bay and lane closest to sea towards town."
+330,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+331,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Marais Road and keep 21KM runners in lane closest to median on mountain side of road."
+332,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Marais Road and keep 21KM runners in lane closest to median on mountain side of road."
+333,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+334,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
+335,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+336,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
+337,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+338,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+339,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,21,"06:54am","08:27am","Keep 21KM runners on the Promenade in the direction of the Lighthouse."
+340,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Worcester Road and keep 21KM runners in lane closest to median on mountain side of road."
+341,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Worcester Road and keep 21KM runners in lane closest to median on mountain side of road."
+342,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+343,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Arthur’s Road and keep 21KM runners in lane closest to median on mountain side of road."
+344,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:54am","08:27am","Control traffic coming into to Beach Road from Arthur’s Road and keep 21KM runners in lane closest to median on mountain side of road."
+345,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:57am","08:30am","Keep 21KM runners towards Camps Bay in lane closest to median on mountain side of Beach Road. Keep 10KM runners going towards Camps Bay in lane closest to the median on sea side of Beach Road and towards town in lane closest to sea."
+346,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,21,"07:18am","09:54am","Control traffic coming into to Beach Road from St John’s Road and keep 21KM runners in lane closest to median on mountain side of road."
+347,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:57am","08:30am","Control traffic coming into to Beach Road from St John’s Road and keep 21KM runners in lane closest to median on mountain side of road."
+348,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,21,"06:57am","08:30am","Direct 21KM runners to follow Promenade in direction of Mouille Point and town."
+349,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:57am","08:30am","Turn 21KM runners onto Promenade. Returning 10KM runners to stay in sea side lane of Beach Road."
+350,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:57am","08:30am","Turn 21KM runners onto Promenade. Returning 10KM runners to stay in sea side lane of Beach Road."
+351,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:57am","08:30am","Control traffic coming into to Beach Road from Church Road and keep 21KM runners in lane closest to median on mountain side of road."
+352,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:57am","08:30am","Control traffic coming into to Beach Road from Church Road and keep 21KM runners in lane closest to median on mountain side of road."
+353,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:57am","08:30am","Direct 21KM runners to turn left into Clarens Road; direct incoming 10KM runners across break in median into lane closest to median on mountain side of road."
+354,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:57am","08:30am","Direct 21KM runners to turn left into Clarens Road; direct incoming 10KM runners across break in median into lane closest to median on mountain side of road."
+355,"Eerste River",,,,,,"Raphael Manual","084 494 4525","raphaeljm@12gmail.com",2,"21 & 10","06:57am","08:30am","Direct 21KM runners to turn left into Clarens Road; direct incoming 10KM runners across break in median into lane closest to median on mountain side of road."
+356,"Walmer AC","Wajdi","Kader","Wajdi Kader","0823750395","kadcon.consultants@gmail.com","Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
+357,"Walmer AC","Rashida","Kader","Rashida Kader","0837774747","Rashidakader1411@gmail.com","Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Keep 21KM runners in lane closest to median on mountain side of Beach Road towards Camps Bay; keep traffic in lane closest to mountain towards Camps Bay."
+358,"Walmer AC","Waseem","Matthews","Waseem Matthews","084 444 3817","waseemct@gmail.com","Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
+359,"Walmer AC","Shaheedah","Ismail","Shaheedah Ismail","0726293913","shaheedahismail@gmail.com","Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
+360,"Walmer AC","Nafeesa","Ismail","Nafeesa Ismail","071 389 3062","nafeesaismail15@gmail.com","Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
+361,"Walmer AC","Rayaan","Williams","Rayaan Williams","0760859303","raywilliamsct@gmail.com","Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
+362,"Walmer AC","Wedaad","Adams","Wedaad Adams","0825755353","naj.physio@gmail.com","Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Keep 21KM runners on the Promenade in the direction of Lighthouse."
+363,"Walmer AC","Najmee","Marlie","Najmee Marlie","0828312799","najmee.marlie@gmail.com","Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Guide the 21KM runners onto Beach Road pavement in direction of Lighthouse."
+364,"Walmer AC","Zaheer","Jacobs","Zaheer Jacobs","083 546 6802","zaheerjac@gmail.com","Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Bill Peters Drive."
+365,"Walmer AC","Imraan","Kahaar","Imraan Kahaar","0826673195","imraankahaar@gmail.com","Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Keep 21KM runners on pavement and sea side of road; 10KM runners on mountain side of road; control traffic at Bill Peters Drive."
+366,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Direct 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
+367,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬","??",2,21,"07:24am","09:30am","Direct 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
+367,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"07:24am","09:30am","Direct 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
+368,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬","??",2,21,"06:45am","07:30am","Keep 21KM runners onto the Sea Point side of Chiappini Road; control cars on Chiappini Road."
+369,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Direct 21KM runners onto the sea side of Somerset Road; control cars on Chiappini Road."
+370,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Direct 21KM runners onto the sea side of Somerset Road; control cars on Chiappini Road."
+371,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Direct 21KM runners onto the sea side of Somerset Road; control cars on Chiappini Road."
+372,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road; control cars on Alfred Road."
+373,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road; control cars on Alfred Road."
+374,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road."
+375,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road."
+376,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic entering and leaving BP Garage."
+377,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic entering and leaving BP Garage."
+378,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic entering and leaving BP Garage."
+379,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic entering and leaving BP Garage."
+380,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic at parking."
+381,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Keep 21KM runners onto the sea side of Somerset Road. Control traffic at parking."
+382,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Direct runners on to Fan Walk towards the underpass; control cars turning off Somerset Road."
+383,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Direct runners on to Fan Walk towards the underpass; control cars turning off Somerset Road."
+384,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Direct runners on to Fan Walk towards the underpass; control cars at parking."
+385,"Walmer AC",,,,,,"Waseemah Kamish","083 462 4803‬",,2,21,"06:45am","07:30am","Direct runners on to Fan Walk towards the underpass; control cars at parking."
+401,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Keep outgoing 10KM runners on the mountain side of Beach Road towards Camps Bay."
+402,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Keep outgoing 10KM runners on the mountain side of Beach Road towards Camps Bay."
+403,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Guide returning 10KM runners to the sea side lane closest to pools."
+404,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,"21 & 10","07:18am","10:06am","Guide 21KM runners onto the pavement; keep 10KM runners on the road."
+405,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Keep 10KM runners on Beach Road towards Camps Bay."
+406,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Control traffic coming into to Beach Road from St Andrew’s Road and keep 10KM runners on Beach Road towards Camps Bay."
+407,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Control traffic coming into to Beach Road from St Andrew’s Road and keep 10KM runners on Beach Road towards Camps Bay."
+408,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Keep 10KM runners on Beach Road towards Camps Bay."
+409,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Keep 10KM runners on Beach Road towards Camps Bay; keep runners off the slip road."
+410,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Control traffic coming into to Beach Road from Solomons Road and keep 10KM runners on Beach Road towards Camps Bay."
+411,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Control traffic coming into to Beach Road from Solomons Road and keep 10KM runners on Beach Road towards Camps Bay."
+412,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Turn 10KM runners towards the Queen’s Road circle and back on to Beach Road along the sea towards town."
+413,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,10,"07:45am","08:15am","Turn 10KM runners towards the Queen’s Road circle and back on to Beach Road along the sea towards town."
+414,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,"21 & 10","07:18am","09:54am","Turn 10KM runners back on to mountain side of Beach Road along the sea towards town."
+415,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Guide 21KM around the circle onto the sea side of Beach Road towards town."
+416,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Guide 21KM around the circle onto the sea side of Beach Road towards town; control traffic entering Beach Road in the direction of Camps Bay."
+417,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; keep 10KM in mountain side lane towards town."
+418,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,"21 & 10","07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; keep 10KM in mountain side lane towards town."
+419,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,"21 & 10","07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; keep 10KM in mountain side lane towards town."
+420,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,"21 & 10","07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; keep 10KM in mountain side lane towards town."
+421,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,"21 & 10","07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; keep 10KM in mountain side lane towards town."
+422,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Control traffic coming into Queen’s Road towards the circle."
+423,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Control traffic coming into Queen’s Road towards the circle."
+424,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Control traffic coming into Queen’s Road towards the circle."
+425,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; control traffic in the mountain side lane."
+426,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town; control traffic in the mountain side lane."
+427,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town."
+428,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town."
+429,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town."
+430,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:18am","09:54am","Keep 21KM runners in sea side lane of Beach Road towards town."
+431,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Turn 21KM runners off Victoria Road and down Seacliffe Road."
+432,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Turn 21KM runners off Victoria Road and down Seacliffe Road."
+433,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Turn 21KM runners off Victoria Road and down Seacliffe Road."
+434,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+435,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+436,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+437,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+438,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+439,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+440,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+441,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+442,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+443,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+444,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+445,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:45am","07:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+446,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:45am","07:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+447,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+448,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+449,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+450,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+451,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+452,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+453,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+454,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+455,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+456,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+457,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+458,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+459,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+460,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+461,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+462,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+463,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+464,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+465,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+466,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+467,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+468,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+469,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+470,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+471,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+472,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+473,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+474,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"06:57am","08:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+475,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+476,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+477,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+478,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+479,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+480,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+481,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions. Control cars’ access to driveways."
+482,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:42am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+483,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+484,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+485,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+486,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+487,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on pavement and sea side of road; Victoria road is open to traffic in both directions."
+488,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Turn 21KM runners on to Victoria Road towards town; control traffic as they cross. Victoria Road is open to traffic in both directions."
+490,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Turn runners onto Victoria Road in direction of City Centre - control traffic coming from Clifton. This side of the road is open to traffic."
+490,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Turn 21KM runners on to Victoria Road towards town; control traffic as they cross. Victoria Road is open to traffic in both directions."
+491,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Turn runners onto Victoria Road in direction of City Centre - control traffic coming from Clifton. This side of the road is open to traffic."
+491,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Turn 21KM runners on to Victoria Road towards town; control traffic as they cross. Victoria Road is open to traffic in both directions."
+501,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Control traffic as 21KM runners cross Regent Road on Clarens Road."
+502,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Control traffic as 21KM runners cross Regent Road on Clarens Road."
+503,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Turn runners off Clarens Road on to the sea side lane of Kloof Road; Kloof Road is open to traffic towards town."
+504,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+505,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+506,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+507,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); control traffic on Kei Apple Road. Kloof Road is open to traffic towards town."
+508,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+509,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:12am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+510,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); control traffic on Quendon Road. Kloof Road is open to traffic towards town."
+511,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:30am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+512,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+513,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+514,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); control traffic on Kings Road. Kloof Road is open to traffic towards town."
+515,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+516,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+517,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); control traffic on Queens Road. Kloof Road is open to traffic towards town."
+518,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+519,"Nantes",,,,,,"Mario Hendricks","084 359 8970","mario.hendricks@morton.co.za",2,21,"07:15am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); control traffic on Fir Avenue. Kloof Road is open to traffic towards town."
+520,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+521,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+522,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+523,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+524,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+525,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+526,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+527,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+528,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+529,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:00am","08:42am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+530,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+531,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+532,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+533,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+534,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+535,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+536,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+537,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+538,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+539,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+540,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:03am","08:54am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+541,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+542,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+543,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+544,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+545,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+546,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+547,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+548,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+549,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+550,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+551,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+552,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+553,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+554,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+555,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+556,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+557,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+558,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+559,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+560,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:06am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+561,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+562,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Turn runners onto Victoria Road towards town; control traffic as runners cross. Victoria Road is open to traffic in both directions."
+563,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Turn runners onto Victoria Road towards town; control traffic as runners cross. Victoria Road is open to traffic in both directions."
+564,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Turn runners onto Victoria Road towards town; control traffic as runners cross. Victoria Road is open to traffic in both directions."
+565,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+566,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+567,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+568,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+569,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+570,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+571,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+572,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+573,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+574,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+575,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+576,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
+577,"Midas Spartans",,,,,,"Ingrid Fullard","071 344 0875","midasspartansac@gmail.com",2,21,"07:06am","09:18am","Keep runners on the sea side lane of Kloof Road on inside of cones (especially on the bends); Kloof Road is open to traffic towards town."
diff --git a/GIS Base Map/osm_roads.dbf b/GIS Base Map/osm_roads.dbf
index d65857f..7f0d3ec 100644
Binary files a/GIS Base Map/osm_roads.dbf and b/GIS Base Map/osm_roads.dbf differ
diff --git a/README.md b/README.md
index 6ca4c47..cec734e 100644
--- a/README.md
+++ b/README.md
@@ -111,8 +111,8 @@ WHEN "Source" = 'Trail' THEN
 		WHEN regexp_match( "Name", '^14$') THEN 'L,TL'
 		WHEN regexp_match( "Name", '^8$') THEN 'L,BL'
 		WHEN regexp_match( "Name", '^9$') THEN 'R,TR'
-		WHEN regexp_match( "Name", '^Finish$') THEN 'R,BR'
-		WHEN regexp_match( "Name", '^Start$') THEN 'R,TR'
+		WHEN regexp_match( "Name", '^Finish$') THEN 'L,BL'
+		WHEN regexp_match( "Name", '^Start$') THEN 'R,BR'
 	END
 END
 ```