From 621c8842b10e6181a7a90073622862ec937593d1 Mon Sep 17 00:00:00 2001
From: tim <tim@treehouse.org.za>
Date: Thu, 14 Sep 2023 23:12:16 +0200
Subject: [PATCH] Update marshal position data

---
 GIS Base Map/Gun Run.qgs           | 28994 ++++++++++++++-------------
 GIS Base Map/Gun Run.qgs~          | 28994 ++++++++++++++-------------
 GIS Base Map/marshal_positions.dbf |   Bin 57082 -> 54507 bytes
 GIS Base Map/marshal_positions.shp |   Bin 15156 -> 14856 bytes
 GIS Base Map/marshal_positions.shx |   Bin 4516 -> 4316 bytes
 create_index.py                    |    18 +-
 6 files changed, 29017 insertions(+), 28989 deletions(-)

diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index a6fc739..dcbfedd 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" projectname="Gun Run" saveUserFull="Timothy Allen" saveDateTime="2023-09-14T17:03:35" version="3.32.2-Lima">
+<qgis saveUserFull="Timothy Allen" projectname="Gun Run" saveUser="tim" version="3.32.2-Lima" saveDateTime="2023-09-14T20:26:35">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,214 +17,118 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer light-azimuth="315" edl-is-active="1" edl-distance="0.5" edl-distance-unit="0" hillshading-is-multidirectional="0" combined-method="0" edl-strength="1000" hillshading-is-active="0" hillshading-z-factor="1" is-active="0" light-altitude="45"/>
+  <elevation-shading-renderer light-altitude="45" hillshading-is-multidirectional="0" edl-strength="1000" edl-distance-unit="0" light-azimuth="315" combined-method="0" is-active="0" hillshading-z-factor="1" edl-is-active="1" edl-distance="0.5" hillshading-is-active="0"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group name="Marshals" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group expanded="1" name="Marshals" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_exp="" name="marshal_positions" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="marshal_positions" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-            <Option value="1" name="showFeatureCount" type="int"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="extra_security20170921130834191" legend_exp="" name="extra_security" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./extra_security.shp" checked="Qt::Unchecked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="extra_security" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./extra_security.shp" checked="Qt::Unchecked" id="extra_security20170921130834191" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshals_by_position20161003112326575" legend_exp="" name="marshals_by_position" legend_split_behavior="0" patch_size="0,0" expanded="1" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" providerKey="delimitedtext">
+      <layer-tree-layer expanded="1" name="marshals_by_position" legend_exp="" legend_split_behavior="0" providerKey="delimitedtext" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" id="marshals_by_position20161003112326575" patch_size="0,0">
         <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-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_exp="" name="complete_marshal_overview" legend_split_behavior="0" patch_size="0,0" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" providerKey="virtual">
+      <layer-tree-layer expanded="1" name="complete_marshal_overview" legend_exp="" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_exp="" name="marshal_overviews" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" providerKey="ogr">
+      <layer-tree-layer expanded="0" name="marshal_overviews" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group expanded="1" name="Fencing and Cones" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="fencing" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" legend_exp="" name="cone_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
+      <layer-tree-layer expanded="1" name="cone_groups" legend_exp="" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" patch_size="-1,-1">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" legend_exp="" name="fence_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
+      <layer-tree-layer expanded="1" name="fence_groups" legend_exp="" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" patch_size="-1,-1">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" legend_exp="" name="fence_and_cone_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
+      <layer-tree-layer expanded="1" name="fence_and_cone_groups" legend_exp="" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" patch_size="-1,-1">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group name="Markers" expanded="1" groupLayer="" checked="Qt::Checked">
+      <layer-tree-group expanded="1" name="Markers" checked="Qt::Checked" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" legend_exp="" name="route_markers" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,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=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={431ef746-5362-4d7c-bf35-560ac1fcdbbf}" checked="Qt::Unchecked" providerKey="memory">
+        <layer-tree-layer expanded="1" name="route_markers" legend_exp="" legend_split_behavior="0" providerKey="memory" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,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=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={d1d27919-97ae-4331-93b6-0ce20cde20cc}" checked="Qt::Unchecked" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" patch_size="-1,-1">
           <customproperties>
             <Option type="Map">
               <Option name="expandedLegendNodes" type="invalid"/>
-              <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 id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option value="0" name="showFeatureCount" type="int"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="0" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_exp="" name="timelapse" legend_split_behavior="0" patch_size="0,0" expanded="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">
+    <layer-tree-layer expanded="0" name="timelapse" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" checked="Qt::Unchecked" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0">
       <customproperties>
         <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group name="Feeding Stations" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group expanded="1" name="Feeding Stations" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="water_tables20170921142016467" legend_exp="" name="water_tables" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./water_tables.shp" checked="Qt::Checked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Ask Me" expanded="0" groupLayer="" checked="Qt::Unchecked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Residents Access" expanded="0" groupLayer="" checked="Qt::Unchecked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_exp="" name="mayor" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./mayor.shp" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_exp="" name="viplabels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./viplabels.shp" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_exp="" name="vipaccess" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./vipaccess.shp" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_exp="" name="golfaccess" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./golfaccess.shp" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_exp="" name="residents_access" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="OSM data" expanded="1" groupLayer="" checked="Qt::Checked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_exp="" name="osm_roads" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./osm_roads.shp" checked="Qt::Checked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_exp="" name="osm_places" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" expanded="1" groupLayer="" checked="Qt::Unchecked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_exp="" name="data-comments" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./data-comments.shp" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_exp="" name="start_finish_area" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./start_finish_area.shp" checked="Qt::Unchecked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="water_tables" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./water_tables.shp" checked="Qt::Checked" id="water_tables20170921142016467" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -232,33 +136,129 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" expanded="0" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group expanded="0" name="Ask Me" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_exp="" name="capetownelevation-1m" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="poi_labels" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="directions_to_start" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" name="Residents Access" checked="Qt::Unchecked" groupLayer="">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="1" name="mayor" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./mayor.shp" checked="Qt::Unchecked" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="viplabels" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./viplabels.shp" checked="Qt::Unchecked" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="vipaccess" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./vipaccess.shp" checked="Qt::Unchecked" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="0" name="golfaccess" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./golfaccess.shp" checked="Qt::Unchecked" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="residents_access_roads" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="residents_access" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="1" name="OSM data" checked="Qt::Checked" groupLayer="">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="0" name="osm_roads" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./osm_roads.shp" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <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" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group expanded="1" name="Start and Finish pages" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" providerKey="gdal">
+      <layer-tree-layer expanded="1" name="data-comments" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./data-comments.shp" checked="Qt::Unchecked" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_exp="" name="Outlines" legend_split_behavior="0" patch_size="0,0" expanded="1" 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">
+      <layer-tree-layer expanded="1" name="start_finish_area" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./start_finish_area.shp" checked="Qt::Unchecked" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" name="Elevation" checked="Qt::Unchecked" groupLayer="">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="1" name="capetownelevation-1m" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="showFeatureCount" value="1" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="1" name="Map" checked="Qt::Checked" groupLayer="">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="0" name="GDAL-City of Cape Town 2015 Aerial" legend_exp="" legend_split_behavior="0" providerKey="gdal" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="Outlines" legend_exp="" legend_split_behavior="0" providerKey="wms" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -293,33 +293,33 @@
       <item>route_markers_022f7471_3d57_403e_b836_6019bd5d0709</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings enabled="0" maxScale="0" mode="3" tolerance="10" self-snapping="1" minScale="0" type="1" intersection-snapping="1" unit="1" scaleDependencyMode="0">
+  <snapping-settings self-snapping="1" unit="1" maxScale="0" intersection-snapping="1" scaleDependencyMode="0" mode="3" enabled="0" type="1" minScale="0" tolerance="10">
     <individual-layer-settings>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" maxScale="0" tolerance="20" minScale="0" type="2" units="1"/>
-      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="0" maxScale="0" tolerance="12" minScale="0" type="0" units="1"/>
-      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="0" maxScale="0" tolerance="12" minScale="0" type="0" units="1"/>
-      <layer-setting id="water_tables20170921142016467" enabled="0" maxScale="0" tolerance="0" minScale="0" type="2" units="2"/>
-      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="extra_security20170921130834191" enabled="0" maxScale="0" tolerance="0" minScale="0" type="2" units="2"/>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting maxScale="0" enabled="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="water_tables20170921142016467" units="2" type="2" minScale="0" tolerance="0"/>
+      <layer-setting maxScale="0" enabled="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" units="1" type="0" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="extra_security20170921130834191" units="2" type="2" minScale="0" tolerance="0"/>
+      <layer-setting maxScale="0" enabled="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" type="0" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" type="2" minScale="0" tolerance="20"/>
+      <layer-setting maxScale="0" enabled="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" type="2" minScale="0" tolerance="12"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -327,10 +327,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.39449634270076572</xmin>
-      <ymin>-33.90828503601445476</ymin>
-      <xmax>18.39585035230306787</xmax>
-      <ymax>-33.90669064043363079</ymax>
+      <xmin>18.37949637989449414</xmin>
+      <ymin>-33.93407516147076564</ymin>
+      <xmax>18.38037357703536046</xmax>
+      <ymax>-33.93304222991539376</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -351,171 +351,171 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" name="Marshals" checked="Qt::Checked">
-      <legendlayer open="true" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="1"/>
+    <legendgroup name="Marshals" checked="Qt::Checked" open="true">
+      <legendlayer name="marshal_positions" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="1" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
+      <legendlayer name="extra_security" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="extra_security20170921130834191" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="marshals_by_position" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
+      <legendlayer name="marshals_by_position" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="1" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="marshals_by_position20161003112326575" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
+      <legendlayer name="complete_marshal_overview" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
+      <legendlayer name="marshal_overviews" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Fencing and Cones" checked="Qt::Unchecked">
-      <legendlayer open="true" name="fencing" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
+    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="true">
+      <legendlayer name="fencing" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="cone_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" isInOverview="0" visible="0"/>
+      <legendlayer name="cone_groups" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="fence_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0" visible="0"/>
+      <legendlayer name="fence_groups" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="fence_and_cone_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" isInOverview="0" visible="0"/>
+      <legendlayer name="fence_and_cone_groups" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Routes" checked="Qt::Checked">
-      <legendgroup open="true" name="Markers" checked="Qt::Checked">
-        <legendlayer open="true" name="route_markers" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" isInOverview="0" visible="0"/>
+    <legendgroup name="Routes" checked="Qt::Checked" open="true">
+      <legendgroup name="Markers" checked="Qt::Checked" open="true">
+        <legendlayer name="route_markers" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="1" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile layerid="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="0" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" name="all_routes" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
+      <legendlayer name="all_routes" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer open="false" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-      <filegroup open="false" hidden="false">
-        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
+    <legendlayer name="timelapse" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="false">
+      <filegroup hidden="false" open="false">
+        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0" isInOverview="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" name="Feeding Stations" checked="Qt::Checked">
-      <legendlayer open="true" name="water_tables" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
+    <legendgroup name="Feeding Stations" checked="Qt::Checked" open="true">
+      <legendlayer name="water_tables" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="water_tables20170921142016467" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
-      <legendlayer open="true" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
+    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
+      <legendlayer name="poi_labels" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
+      <legendlayer name="directions_to_start" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
-      <legendlayer open="true" name="mayor" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
+    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
+      <legendlayer name="mayor" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
+      <legendlayer name="viplabels" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
+      <legendlayer name="vipaccess" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
+      <legendlayer name="golfaccess" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
+      <legendlayer name="residents_access_roads" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
+      <legendlayer name="residents_access" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
-      <legendlayer open="false" name="osm_roads" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
+    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
+      <legendlayer name="osm_roads" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="1" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="osm_places" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
+      <legendlayer name="osm_places" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="1" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
-      <legendlayer open="true" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
+    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="true">
+      <legendlayer name="data-comments" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
+      <legendlayer name="start_finish_area" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
-      <legendlayer open="true" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
+    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
+      <legendlayer name="capetownelevation-1m" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="1" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Map" checked="Qt::Checked">
-      <legendlayer open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="1"/>
+    <legendgroup name="Map" checked="Qt::Checked" open="true">
+      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="Outlines" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
+      <legendlayer name="Outlines" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="0" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="0" styleCategories="AllStyleCategories" type="annotation" refreshOnNotifyEnabled="0">
+  <main-annotation-layer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" type="annotation" minScale="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -576,7 +576,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyEnabled="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" type="raster" minScale="1e+08">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -642,7 +642,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -667,97 +667,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" enabled="0" zoffset="0" symbology="Line" zscale="1">
+      <elevation zscale="1" band="1" symbology="Line" enabled="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{31a148a7-0364-430a-b534-21f418a5bb1b}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -766,28 +766,28 @@
       </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>
       <mapTip enabled="1"></mapTip>
       <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 enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer blueBand="3" alphaBand="-1" opacity="0.5" type="multibandcolor" redBand="1" nodataColor="" greenBand="2">
+        <rasterrenderer blueBand="3" redBand="1" alphaBand="-1" nodataColor="" opacity="0.5" greenBand="2" type="multibandcolor">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -798,14 +798,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation colorizeGreen="128" colorizeOn="0" colorizeBlue="128" saturation="0" invertColors="0" grayscaleMode="0" colorizeStrength="100" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="0" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyEnabled="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" type="raster" minScale="1e+08">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -871,7 +871,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -894,97 +894,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" enabled="0" zoffset="0" symbology="Line" zscale="1">
+      <elevation zscale="1" band="1" symbology="Line" enabled="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -993,28 +993,28 @@
       </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>
       <mapTip enabled="1"></mapTip>
       <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 enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer band="1" alphaBand="-1" opacity="0.75" type="singlebandcolordata" nodataColor="">
+        <rasterrenderer band="1" alphaBand="-1" nodataColor="" opacity="0.75" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1025,14 +1025,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation colorizeGreen="128" colorizeOn="0" colorizeBlue="128" saturation="0" invertColors="0" grayscaleMode="0" colorizeStrength="100" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1098,7 +1098,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="EPSG:4326" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="EPSG:4326" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1112,8 +1112,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field expression="$length * 100" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_km" type="6"/>
-        <field expression="$length * 100 * 1000" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_m" type="6"/>
+        <field typeName="double precision" name="length_km" comment="" precision="0" expression="$length * 100" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="length_m" comment="" precision="0" expression="$length * 100 * 1000" subType="0" type="6" length="-1"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1126,264 +1126,264 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="RouteLen" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="RouteLen" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2821b303-e942-4f2b-95eb-71ba37854d84}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day" description="Only show when active in Atlas" symbol="0">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" label="21KM" description="This should be disabled, since it's only for legends" symbol="1"/>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" label="10KM" description="This should be disabled, since it's only for legends" symbol="2"/>
-            <rule filter="&quot;Source&quot; ILIKE '5KM%'" key="{871a9276-8278-4528-911c-7e434c0885d3}" checkstate="0" label="5KM" description="This should be disabled, since it's only for legends" symbol="3"/>
-            <rule filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" checkstate="0" label="Trail" description="This should be disabled, since it's only for legends" symbol="4"/>
+          <rule 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)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day">
+            <rule description="This should be disabled, since it's only for legends" symbol="1" checkstate="0" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="21KM"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="2" checkstate="0" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="10KM"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="3" checkstate="0" filter="&quot;Source&quot; ILIKE '5KM%'" key="{871a9276-8278-4528-911c-7e434c0885d3}" label="5KM"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="4" checkstate="0" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" label="Trail"/>
           </rule>
-          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" checkstate="0" label="Always show" symbol="5"/>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" checkstate="0" label="Always show by day" symbol="6"/>
+          <rule symbol="5" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show"/>
+          <rule symbol="6" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show by day"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{c07399ea-beb4-4328-8240-a80a1288dc13}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@0@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
                       <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>
                       <data_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; ILIKE '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; ILIKE '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>
@@ -1391,308 +1391,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="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>
               <data_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; ILIKE '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; ILIKE '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="outlineStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')" 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 , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#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 enabled="1" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
                   <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>
                   <data_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; ILIKE '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; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{3d683642-1e02-4313-ae66-4b398724d7bc}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
                   <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>
                   <data_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; ILIKE '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; ILIKE '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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{d9268524-45f1-4731-945d-c43780c8de62}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{d9268524-45f1-4731-945d-c43780c8de62}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
                   <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="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="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="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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@1@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
                       <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>
                       <data_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>
@@ -1700,308 +1700,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="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.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="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.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="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>
               <data_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="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" 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 enabled="1" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="2" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@2@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
                       <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>
                       <data_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>
@@ -2009,308 +2009,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="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>
               <data_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="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" 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 enabled="1" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="3" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@3@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@3@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
                       <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>
                       <data_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>
@@ -2318,308 +2318,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="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>
               <data_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="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" 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 enabled="1" id="{09613930-5415-4f16-9126-06282c6e8ebe}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@3@2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@3@3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="4" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@4@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@4@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
                       <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>
                       <data_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>
@@ -2627,302 +2627,302 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="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>
               <data_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="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" 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 enabled="1" id="{536a9089-88ae-403e-a80e-164ca63e1aee}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@4@2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@4@3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="5" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_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; ILIKE '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; ILIKE '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" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="6" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.46" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.46" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <data_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; ILIKE '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; ILIKE '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>
@@ -2934,334 +2934,334 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{064eef02-df9e-463c-8751-4b7fad6f7d48}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{9975d16f-40da-4a85-9213-5f1b0f651928}" active="0" description="Active routes">
+          <rule active="0" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{9975d16f-40da-4a85-9213-5f1b0f651928}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round($length / 1000, 0)" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round($length / 1000, 0)" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="km_marker()" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="1" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="0" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="3" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="km_marker()" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="1" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&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;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="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}" active="0" description="Route lengths">
+          <rule active="0" description="Route lengths" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100, 4 )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round( $length * 100, 4 )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="km_marker()" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapAtNoCost" repeatDistance="50" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="0" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="3" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapAtNoCost" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="km_marker()" repeatDistance="50" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&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;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>
@@ -3270,16 +3270,16 @@
       </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>
-          <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>
@@ -3287,54 +3287,54 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{99bd229d-7319-436f-b616-1be11812c381}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{99bd229d-7319-436f-b616-1be11812c381}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -3342,16 +3342,16 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3362,8 +3362,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>
@@ -3372,8 +3372,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>
@@ -3382,8 +3382,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>
@@ -3392,8 +3392,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>
@@ -3402,8 +3402,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>
@@ -3426,8 +3426,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>
@@ -3436,8 +3436,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>
@@ -3446,24 +3446,24 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="begin"/>
-        <alias name="" index="2" field="end"/>
-        <alias name="" index="3" field="Distance"/>
-        <alias name="" index="4" field="RouteLen"/>
-        <alias name="" index="5" field="Sort"/>
-        <alias name="" index="6" field="day"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="length_m"/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="begin"/>
+        <alias index="2" name="" field="end"/>
+        <alias index="3" name="" field="Distance"/>
+        <alias index="4" name="" field="RouteLen"/>
+        <alias index="5" name="" field="Sort"/>
+        <alias index="6" name="" field="day"/>
+        <alias index="7" name="" field="Source"/>
+        <alias index="8" name="" field="length_km"/>
+        <alias index="9" name="" field="length_m"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -3478,28 +3478,28 @@
         <policy field="length_m" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="Name"/>
-        <default expression="" applyOnUpdate="0" field="begin"/>
-        <default expression="" applyOnUpdate="0" field="end"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="Sort"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Sort" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Sort" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="Name"/>
@@ -3514,25 +3514,25 @@
         <constraint desc="" exp="" field="length_m"/>
       </constraintExpressions>
       <expressionfields>
-        <field expression="$length * 100" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_km" type="6"/>
-        <field expression="$length * 100 * 1000" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_m" type="6"/>
+        <field typeName="double precision" name="length_km" comment="" precision="0" expression="$length * 100" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="length_m" comment="" precision="0" expression="$length * 100 * 1000" subType="0" type="6" length="-1"/>
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;" sortOrder="0">
         <columns>
-          <column width="121" name="Name" type="field" hidden="0"/>
-          <column width="141" name="begin" type="field" hidden="0"/>
-          <column width="31" name="end" type="field" hidden="0"/>
-          <column width="66" name="Distance" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="39" name="RouteLen" type="field" hidden="0"/>
-          <column width="250" name="Source" type="field" hidden="0"/>
-          <column width="175" name="length_m" type="field" hidden="0"/>
-          <column width="50" name="Sort" type="field" hidden="0"/>
-          <column width="31" name="day" type="field" hidden="0"/>
-          <column width="266" name="length_km" type="field" hidden="0"/>
+          <column name="Name" hidden="0" width="121" type="field"/>
+          <column name="begin" hidden="0" width="141" type="field"/>
+          <column name="end" hidden="0" width="31" type="field"/>
+          <column name="Distance" hidden="0" width="66" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="RouteLen" hidden="0" width="39" type="field"/>
+          <column name="Source" hidden="0" width="250" type="field"/>
+          <column name="length_m" hidden="0" width="175" type="field"/>
+          <column name="Sort" hidden="0" width="50" type="field"/>
+          <column name="day" hidden="0" width="31" type="field"/>
+          <column name="length_km" hidden="0" width="266" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3592,25 +3592,25 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <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"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3684,189 +3684,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{53b6bbaf-4722-434f-a142-936b95477967}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{53b6bbaf-4722-434f-a142-936b95477967}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3877,15 +3877,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 name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3915,9 +3915,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="ID"/>
-        <alias name="" index="1" field="height"/>
-        <alias name="" index="2" field="elevation"/>
+        <alias index="0" name="" field="ID"/>
+        <alias index="1" name="" field="height"/>
+        <alias index="2" name="" field="elevation"/>
       </aliases>
       <splitPolicies>
         <policy field="ID" policy="Duplicate"/>
@@ -3925,14 +3925,14 @@ def my_form_open(dialog, layer, feature):
         <policy field="elevation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="ID"/>
-        <default expression="" applyOnUpdate="0" field="height"/>
-        <default expression="" applyOnUpdate="0" field="elevation"/>
+        <default applyOnUpdate="0" expression="" field="ID"/>
+        <default applyOnUpdate="0" expression="" field="height"/>
+        <default applyOnUpdate="0" expression="" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="ID" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="height" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="elevation" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="ID" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="height" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="elevation" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="ID"/>
@@ -3941,9 +3941,9 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -3966,7 +3966,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Polygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4042,173 +4042,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4219,15 +4219,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -4266,10 +4266,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
-        <alias name="" index="3" field="day"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -4278,16 +4278,16 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="page" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -4297,9 +4297,9 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4322,7 +4322,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Polygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4388,7 +4388,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4417,173 +4417,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
               <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="38,162,105,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="cross" name="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="38,162,105,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="cross" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4594,13 +4594,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="int"/>
+          <Option name="embeddedWidgets/count" value="0" type="int"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -4608,54 +4608,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="5" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="1" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="0" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="5" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="1" spacingUnitScale="3x:0,0,0,0,0,0" direction="0" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4663,22 +4663,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
+      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -4729,12 +4729,12 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="fence_len"/>
-        <alias name="" index="5" field="cone_len"/>
+        <alias index="0" name="" field="name"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="day"/>
+        <alias index="4" name="" field="fence_len"/>
+        <alias index="5" name="" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -4745,20 +4745,20 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="group"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="fence_len"/>
-        <default expression="" applyOnUpdate="0" field="cone_len"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="name"/>
@@ -4770,16 +4770,16 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns>
-          <column width="306" name="name" type="field" hidden="0"/>
-          <column width="-1" name="group" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="day" type="field" hidden="0"/>
-          <column width="-1" name="cone_len" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="name" hidden="0" width="306" type="field"/>
+          <column name="group" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="cone_len" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4825,18 +4825,18 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Polygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4912,173 +4912,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
               <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="38,162,105,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="f_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="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="38,162,105,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="f_diagonal" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5089,13 +5089,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="int"/>
+          <Option name="embeddedWidgets/count" value="0" type="int"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -5103,54 +5103,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="5" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="1" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="0" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="5" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="1" spacingUnitScale="3x:0,0,0,0,0,0" direction="0" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5158,22 +5158,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
+      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -5217,11 +5217,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="cone_len"/>
+        <alias index="0" name="" field="name"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="day"/>
+        <alias index="4" name="" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -5231,18 +5231,18 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="group"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="cone_len"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="name"/>
@@ -5253,17 +5253,17 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns>
-          <column width="306" name="name" type="field" hidden="0"/>
-          <column width="-1" name="group" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="day" 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" type="actions" hidden="1"/>
+          <column name="name" hidden="0" width="306" type="field"/>
+          <column name="group" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="cone_len" hidden="0" width="-1" type="field"/>
+          <column name="fence_len" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5309,18 +5309,18 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5386,7 +5386,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5411,189 +5411,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5604,96 +5604,96 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="Name" fontItalic="0" fontSize="10" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="1" fieldName="Name" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="LineGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="5" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="LineGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="UnknownGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&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;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>
@@ -5701,54 +5701,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5756,16 +5756,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5788,20 +5788,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Name"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Name"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="Name" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -5809,13 +5809,13 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="Name" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5860,7 +5860,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5926,7 +5926,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5951,319 +5951,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{648e55d2-e73b-45b7-bf24-689efea25f17}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM" description="Only show when active in Atlas" symbol="0"/>
-          <rule filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM" description="Only show when active in Atlas" symbol="1"/>
-          <rule filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM" description="Only show when active in Atlas" symbol="2"/>
+          <rule description="Only show when active in Atlas" symbol="0" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM"/>
+          <rule description="Only show when active in Atlas" symbol="1" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM"/>
+          <rule description="Only show when active in Atlas" symbol="2" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{a6a584bd-d0ac-4682-949e-960321bee388}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@0@1@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{2967078f-5e58-40bd-b0c8-aabffd928676}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6271,147 +6271,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{eab0a889-d082-476e-b081-a39cd87a440e}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@1@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{c53a1ec5-544c-48d2-961a-03466d491afc}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6419,100 +6419,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@1@1@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{43e5e783-9402-4471-b264-9b43c9035744}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{43e5e783-9402-4471-b264-9b43c9035744}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6520,147 +6520,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="2" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@2@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6668,100 +6668,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{579d1121-5712-48ef-b839-b461ebde82d6}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@2@1@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6769,41 +6769,41 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6815,11 +6815,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>
@@ -6827,54 +6827,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6882,16 +6882,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6909,28 +6909,28 @@ 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>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Distance"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Distance"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="Distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -6938,13 +6938,13 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <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 name="Distance" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7007,7 +7007,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -7081,187 +7081,187 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="0.796078" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="0.796078" name="0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
               <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>
               <data_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>
@@ -7272,268 +7272,268 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
+          <rule description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="8" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="8" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="1" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="1" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="8" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="1" layerType="UnknownGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
+          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="4" textColor="227,0,185,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="4" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="227,0,185,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.10000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="UnknownGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="2" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&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;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>
@@ -7542,145 +7542,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>
@@ -7688,54 +7688,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7743,16 +7743,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="10" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="10" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7763,8 +7763,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>
@@ -7773,8 +7773,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>
@@ -7783,17 +7783,17 @@ 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>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -7801,14 +7801,14 @@ def my_form_open(dialog, layer, feature):
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -7817,14 +7817,14 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="&quot;position&quot;" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="position" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7900,7 +7900,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Polygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37682610786999859</xmin>
         <ymin>-33.94240746638465822</ymin>
@@ -7966,7 +7966,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7995,173 +7995,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8172,13 +8172,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -8186,54 +8186,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{d22f44d7-7a5a-427f-afda-732ba2664339}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8241,22 +8241,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
+      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -8300,11 +8300,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="fence_len"/>
+        <alias index="0" name="" field="name"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="day"/>
+        <alias index="4" name="" field="fence_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -8314,18 +8314,18 @@ def my_form_open(dialog, layer, feature):
         <policy field="fence_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="group"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="fence_len"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="name"/>
@@ -8336,17 +8336,17 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns>
-          <column width="415" 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="day" type="field" hidden="0"/>
-          <column width="-1" name="fence_len" type="field" hidden="0"/>
+          <column name="name" hidden="0" width="415" type="field"/>
+          <column name="group" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="cone_len" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="fence_len" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8394,19 +8394,19 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8472,7 +8472,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="EPSG:4326" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="EPSG:4326" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8486,47 +8486,47 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="cone_len" type="6"/>
+        <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="cone_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0" type="6" length="-1"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyAlgorithm="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" labelsEnabled="1" simplifyMaxScale="1" minScale="1e+08" simplifyDrawingHints="1" styleCategories="AllStyleCategories" readOnly="0" version="3.8.3-Zanzibar" simplifyLocal="1">
+          <qgis maxScale="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyDrawingTol="1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="1">
+            <renderer-v2 enableorderby="0" forceraster="0" symbollevels="1" type="RuleRenderer">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" symbol="0"/>
+                <rule symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible"/>
               </rules>
               <symbols>
-                <symbol name="0" type="line" alpha="1" force_rhr="0" clip_to_extent="1">
-                  <layer enabled="1" locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="255,255,0,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.5"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="ring_filter" v="0"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <symbol alpha="1" name="0" type="line" force_rhr="0" clip_to_extent="1">
+                  <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="255,255,0,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.5" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="ring_filter"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -8537,62 +8537,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontCapitals="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" namedStyle="Regular" fontWeight="50" blendMode="0" fieldName="comment" fontWordSpacing="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" useSubstitutions="0" isExpression="0" previewBkgrdColor="#ffffff" multilineHeight="1" textOpacity="0.8">
-                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                      <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.6" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.6" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeOffsetX="0"/>
-                      <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135"/>
+                    <text-style fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="#ffffff" isExpression="0" fontCapitals="0" fieldName="comment" textOpacity="0.8" multilineHeight="1" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
+                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0"/>
+                      <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.6" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="1" shapeJoinStyle="128" shapeBorderColor="255,255,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.6" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM"/>
+                      <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowBlendMode="6" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetUnit="MM" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                    <placement geometryGenerator="" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" rotationAngle="0" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" priority="5" xOffset="0" preserveRotation="1" centroidWhole="0" offsetType="0" centroidInside="0" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="5" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM" repeatDistance="0"/>
-                    <rendering obstacleType="0" displayAll="1" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="1" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                    <text-format decimals="3" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                    <placement dist="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" placement="4" placementFlags="2" geometryGeneratorEnabled="0" offsetUnits="MM" rotationAngle="0" preserveRotation="1" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" xOffset="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0" distUnits="MM" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" yOffset="0" repeatDistance="0" geometryGenerator=""/>
+                    <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="1" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" obstacleType="0" drawLabels="1" mergeLines="1" fontMaxPixelSize="10000"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontCapitals="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" namedStyle="Semibold" fontWeight="63" blendMode="0" fieldName="round( $length, 1) || 'm'" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" useSubstitutions="0" isExpression="1" previewBkgrdColor="#ffffff" multilineHeight="1" textOpacity="1">
-                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                      <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0"/>
-                      <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135"/>
+                    <text-style fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" fontSize="12" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="#ffffff" isExpression="1" fontCapitals="0" fieldName="round( $length, 1) || 'm'" textOpacity="1" multilineHeight="1" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
+                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="1"/>
+                      <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM"/>
+                      <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowBlendMode="6" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetUnit="MM" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                    <placement geometryGenerator="" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" rotationAngle="0" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" priority="5" xOffset="0" preserveRotation="1" centroidWhole="0" offsetType="0" centroidInside="0" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="1" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM" repeatDistance="0"/>
-                    <rendering obstacleType="0" displayAll="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                    <text-format decimals="3" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                    <placement dist="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" placement="2" placementFlags="15" geometryGeneratorEnabled="0" offsetUnits="MM" rotationAngle="0" preserveRotation="1" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" xOffset="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0" distUnits="MM" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" yOffset="0" repeatDistance="0" geometryGenerator=""/>
+                    <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
                     <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>
@@ -8600,30 +8600,30 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" barWidth="5" backgroundColor="#ffffff" minScaleDenominator="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleDependency="Area" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+              <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
                 <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" obstacle="0" zIndex="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+            <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -8707,45 +8707,45 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias name="" index="0" field="id"/>
-              <alias name="" index="1" field="group"/>
-              <alias name="" index="2" field="comment"/>
-              <alias name="" index="3" field="moveable"/>
-              <alias name="" index="4" field="type"/>
-              <alias name="" index="5" field="name"/>
-              <alias name="" index="6" field="hidden"/>
-              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
-              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
-              <alias name="" index="9" field="fence_len"/>
-              <alias name="" index="10" field="cone_len"/>
+              <alias index="0" name="" field="id"/>
+              <alias index="1" name="" field="group"/>
+              <alias index="2" name="" field="comment"/>
+              <alias index="3" name="" field="moveable"/>
+              <alias index="4" name="" field="type"/>
+              <alias index="5" name="" field="name"/>
+              <alias index="6" name="" field="hidden"/>
+              <alias index="7" name="" field="auxiliary_storage_labeling_positiony"/>
+              <alias index="8" name="" field="auxiliary_storage_labeling_positionx"/>
+              <alias index="9" name="" field="fence_len"/>
+              <alias index="10" name="" field="cone_len"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default expression="" applyOnUpdate="0" field="id"/>
-              <default expression="" applyOnUpdate="0" field="group"/>
-              <default expression="" applyOnUpdate="0" field="comment"/>
-              <default expression="" applyOnUpdate="0" field="moveable"/>
-              <default expression="" applyOnUpdate="0" field="type"/>
-              <default expression="" applyOnUpdate="0" field="name"/>
-              <default expression="" applyOnUpdate="0" field="hidden"/>
-              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positiony"/>
-              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positionx"/>
-              <default expression="" applyOnUpdate="0" field="fence_len"/>
-              <default expression="" applyOnUpdate="0" field="cone_len"/>
+              <default applyOnUpdate="0" expression="" field="id"/>
+              <default applyOnUpdate="0" expression="" field="group"/>
+              <default applyOnUpdate="0" expression="" field="comment"/>
+              <default applyOnUpdate="0" expression="" field="moveable"/>
+              <default applyOnUpdate="0" expression="" field="type"/>
+              <default applyOnUpdate="0" expression="" field="name"/>
+              <default applyOnUpdate="0" expression="" field="hidden"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
+              <default applyOnUpdate="0" expression="" field="fence_len"/>
+              <default applyOnUpdate="0" expression="" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="comment" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="moveable" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="hidden" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positiony" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positionx" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
             </constraints>
             <constraintExpressions>
               <constraint desc="" exp="" field="id"/>
@@ -8761,27 +8761,27 @@ def my_form_open(dialog, layer, feature):
               <constraint desc="" exp="" field="cone_len"/>
             </constraintExpressions>
             <expressionfields>
-              <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="fence_len" type="6"/>
-              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="fence_len" type="6"/>
-              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="cone_len" type="6"/>
+              <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0" type="6" length="-1"/>
+              <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" type="6" length="-1"/>
+              <field typeName="double precision" name="cone_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0" type="6" length="-1"/>
             </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;">
+            <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
               <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 name="id" hidden="0" width="-1" type="field"/>
+                <column name="group" hidden="0" width="-1" type="field"/>
+                <column hidden="1" width="-1" type="actions"/>
+                <column name="comment" hidden="0" width="223" type="field"/>
+                <column name="moveable" hidden="0" width="-1" type="field"/>
+                <column name="type" hidden="0" width="-1" type="field"/>
+                <column name="name" hidden="0" width="414" type="field"/>
+                <column name="hidden" hidden="0" width="-1" type="field"/>
+                <column name="fence_len" hidden="0" width="-1" type="field"/>
+                <column name="cone_len" hidden="0" width="-1" type="field"/>
+                <column name="auxiliary_storage_labeling_positiony" hidden="1" width="-1" type="field"/>
+                <column name="auxiliary_storage_labeling_positionx" hidden="1" width="-1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8854,458 +8854,458 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b24077c4-36ed-44b5-830f-d1243f319030}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="1">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="1" referencescale="-1" type="RuleRenderer">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
           <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
-            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones" symbol="0"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences" symbol="1"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences" symbol="2"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction" symbol="3"/>
+            <rule symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones"/>
+            <rule symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences"/>
+            <rule symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences"/>
+            <rule symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction"/>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible" symbol="4"/>
-          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" label="Always show" symbol="5"/>
+          <rule symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible"/>
+          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}" label="Always show"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
               <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>
               <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{67070045-bee5-4271-87d3-86da17eb7dbe}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
               <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>
               <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="2" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="3" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="4" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="5" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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.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="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="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.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="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9316,667 +9316,667 @@ def my_form_open(dialog, layer, feature):
         <rules key="{b08c8161-de6f-41d9-a933-40d5428d7db9}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{bc58db75-d3ce-4eaf-8459-5b648cb31e6d}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="comment" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.80000000000000004" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.80000000000000004" fieldName="comment" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.59999999999999998" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeOffsetX="0">
-                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.59999999999999998" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="1" shapeJoinStyle="128" shapeBorderColor="255,255,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.59999999999999998" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="5" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="1" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8200000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="4294967295" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="5" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="5" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="UnknownGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1.8200000000000001" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="1" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{05f0d95c-3454-4dd1-90b4-cb8e0b996d06}" description="Fence lengths">
+          <rule description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{05f0d95c-3454-4dd1-90b4-cb8e0b996d06}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="6" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{64b370d3-e3e2-4e7b-81f6-1372a14c327a}" description="Cones lengths">
+          <rule description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{64b370d3-e3e2-4e7b-81f6-1372a14c327a}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="6" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{ed34792d-3215-42ff-8038-8130a45d3742}" active="0">
+          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{ed34792d-3215-42ff-8038-8130a45d3742}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="6" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="&quot;hidden&quot; IS NULL" key="{faa25ceb-8d2c-4cb2-bacb-dd2fe042fd84}" active="0" description="Always show">
+          <rule active="0" description="Always show" filter="&quot;hidden&quot; IS NULL" key="{faa25ceb-8d2c-4cb2-bacb-dd2fe042fd84}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="6" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&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;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>
@@ -9985,13 +9985,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;id&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -9999,54 +9999,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10054,16 +10054,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10142,16 +10142,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="comment"/>
-        <alias name="" index="3" field="moveable"/>
-        <alias name="" index="4" field="type"/>
-        <alias name="" index="5" field="name"/>
-        <alias name="" index="6" field="hidden"/>
-        <alias name="" index="7" field="day"/>
-        <alias name="" index="8" field="fence_len"/>
-        <alias name="" index="9" field="cone_len"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="comment"/>
+        <alias index="3" name="" field="moveable"/>
+        <alias index="4" name="" field="type"/>
+        <alias index="5" name="" field="name"/>
+        <alias index="6" name="" field="hidden"/>
+        <alias index="7" name="" field="day"/>
+        <alias index="8" name="" field="fence_len"/>
+        <alias index="9" name="" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -10166,28 +10166,28 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="group"/>
-        <default expression="" applyOnUpdate="0" field="comment"/>
-        <default expression="" applyOnUpdate="0" field="moveable"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="hidden"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="fence_len"/>
-        <default expression="" applyOnUpdate="0" field="cone_len"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="comment"/>
+        <default applyOnUpdate="0" expression="" field="moveable"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="hidden"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="comment" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="moveable" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="hidden" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -10202,26 +10202,26 @@ def my_form_open(dialog, layer, feature):
         <constraint desc="" exp="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields>
-        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="cone_len" type="6"/>
+        <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="cone_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0" type="6" length="-1"/>
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column width="31" name="id" type="field" hidden="0"/>
-          <column width="52" name="group" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="85" 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="340" name="name" type="field" hidden="0"/>
-          <column width="54" name="hidden" type="field" hidden="0"/>
-          <column width="74" name="fence_len" type="field" hidden="0"/>
-          <column width="40" name="day" type="field" hidden="0"/>
-          <column width="65" name="cone_len" type="field" hidden="0"/>
+          <column name="id" hidden="0" width="31" type="field"/>
+          <column name="group" hidden="0" width="52" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="comment" hidden="0" width="85" type="field"/>
+          <column name="moveable" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="name" hidden="0" width="340" type="field"/>
+          <column name="hidden" hidden="0" width="54" type="field"/>
+          <column name="fence_len" hidden="0" width="74" type="field"/>
+          <column name="day" hidden="0" width="40" type="field"/>
+          <column name="cone_len" hidden="0" width="65" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10283,23 +10283,23 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="comment"/>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="hidden"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="moveable"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="comment" reuseLastValue="0"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="hidden" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="moveable" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10373,189 +10373,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c73fab62-3b89-497c-a33c-6825e949a9db}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10566,11 +10566,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>
@@ -10578,54 +10578,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10633,16 +10633,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10658,28 +10658,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
+        <alias index="0" name="" field="id"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
       </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" sortExpression="" sortOrder="0">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10722,7 +10722,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiPolygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10796,173 +10796,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10973,9 +10973,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -10988,7 +10988,7 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -10996,54 +10996,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11051,22 +11051,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties" type="Map">
               <Option name="show" type="Map">
-                <Option value="true" name="active" type="bool"/>
-                <Option value="id" name="field" type="QString"/>
-                <Option value="2" name="type" type="int"/>
+                <Option name="active" value="true" type="bool"/>
+                <Option name="field" value="id" type="QString"/>
+                <Option name="type" value="2" type="int"/>
               </Option>
             </Option>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11077,8 +11077,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>
@@ -11087,8 +11087,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>
@@ -11097,8 +11097,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>
@@ -11112,10 +11112,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
-        <alias name="" index="3" field="day"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -11124,16 +11124,16 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="page" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -11143,15 +11143,15 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <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="day" type="field" hidden="0"/>
-          <column width="-1" name="page" type="field" hidden="0"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="page" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11198,7 +11198,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -11264,7 +11264,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="EPSG:4326" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11275,7 +11275,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join memoryCache="0" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" hasCustomPrefix="1" cascadedDelete="0" targetFieldName="position" upsertOnEdit="1" dynamicForm="0" customPrefix="csv_" editable="1">
+        <join dynamicForm="0" memoryCache="0" joinLayerId="marshals_by_position20161003112326575" upsertOnEdit="0" targetFieldName="position" hasCustomPrefix="1" joinFieldName="position" cascadedDelete="0" customPrefix="csv_" editable="0">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -11283,6 +11283,7 @@ def my_form_open(dialog, layer, feature):
             <field name="captain"/>
             <field name="captain_phone"/>
             <field name="race"/>
+            <field name="first_runner"/>
             <field name="last_runner"/>
             <field name="instructions"/>
           </joinFieldsSubset>
@@ -11302,264 +11303,264 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="id" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="id" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" checkstate="0" label="Show by day in marshal plan" description="Show in marshal overview" symbol="0"/>
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" checkstate="0" label="Always show in marshal plan" symbol="1"/>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps" symbol="2"/>
+          <rule description="Show in marshal overview" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" label="Show by day in marshal plan"/>
+          <rule symbol="1" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" label="Always show in marshal plan"/>
+          <rule symbol="2" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="0.8" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="0.8" name="0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" locked="0" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="marker" frame_rate="10" alpha="0.8" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="0.8" name="1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{984895dc-f666-478a-9853-cf8b1ad766f1}" locked="0" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="marker" frame_rate="10" alpha="0.01" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="0.01" name="2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" locked="0" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="0.1" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="0.1" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11567,825 +11568,825 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{2cd5bd60-2418-42c7-89dd-9f389593e547}">
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+        <rules key="{6f58a0db-c166-42ee-980e-2dea553699f9}">
+          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e14f9224-01e0-4824-a165-56a21ada3031}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="6" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.10000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="2" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+          <rule active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{47102982-7716-4119-9afc-04e936456ece}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="6" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.10000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="2" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
+          <rule 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' )" key="{66cc438a-cab2-4b9b-a0b6-ee5e9f6087b3}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.5" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="6" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.5" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="8" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="UnknownGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="5" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
+          <rule 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 AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{15f72075-751f-4669-b911-602d7914905d}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.59999999999999998" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="6" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.59999999999999998" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.59999999999999998" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="8" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="5" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
+          <rule 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" key="{76b7264e-9235-4824-98a7-4a0e40535053}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="8" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="8" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.90000000000000002" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,0,255" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.90000000000000002" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="10" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="10" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&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;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>
@@ -12394,157 +12395,150 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option 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>
@@ -12552,54 +12546,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{444d8fb8-2321-4272-9699-88b713425993}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{444d8fb8-2321-4272-9699-88b713425993}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12607,16 +12601,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12627,8 +12621,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>
@@ -12637,8 +12631,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>
@@ -12647,8 +12641,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>
@@ -12657,8 +12651,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>
@@ -12671,63 +12665,70 @@ def my_form_open(dialog, layer, feature):
           </editWidget>
         </field>
         <field name="GROUP" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_day" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_position" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_club" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_captain" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_captain_phone" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_race" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_first_runner" configurationFlags="None">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_last_runner" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_instructions" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
@@ -12735,20 +12736,21 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="notes"/>
-        <alias name="" index="4" field="day"/>
-        <alias name="" index="5" field="GROUP"/>
-        <alias name="" index="6" field="csv_day"/>
-        <alias name="" index="7" field="csv_position"/>
-        <alias name="" index="8" field="csv_club"/>
-        <alias name="" index="9" field="csv_captain"/>
-        <alias name="" index="10" field="csv_captain_phone"/>
-        <alias name="" index="11" field="csv_race"/>
-        <alias name="" index="12" field="csv_last_runner"/>
-        <alias name="" index="13" field="csv_instructions"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="notes"/>
+        <alias index="4" name="" field="day"/>
+        <alias index="5" name="" field="GROUP"/>
+        <alias index="6" name="" field="csv_day"/>
+        <alias index="7" name="" field="csv_position"/>
+        <alias index="8" name="" field="csv_club"/>
+        <alias index="9" name="" field="csv_captain"/>
+        <alias index="10" name="" field="csv_captain_phone"/>
+        <alias index="11" name="" field="csv_race"/>
+        <alias index="12" name="" field="csv_first_runner"/>
+        <alias index="13" name="" field="csv_last_runner"/>
+        <alias index="14" name="" field="csv_instructions"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -12763,40 +12765,43 @@ def my_form_open(dialog, layer, feature):
         <policy field="csv_captain" policy="Duplicate"/>
         <policy field="csv_captain_phone" policy="Duplicate"/>
         <policy field="csv_race" policy="Duplicate"/>
+        <policy field="csv_first_runner" policy="Duplicate"/>
         <policy field="csv_last_runner" policy="Duplicate"/>
         <policy field="csv_instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="notes"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="GROUP"/>
-        <default expression="" applyOnUpdate="0" field="csv_day"/>
-        <default expression="" applyOnUpdate="0" field="csv_position"/>
-        <default expression="" applyOnUpdate="0" field="csv_club"/>
-        <default expression="" applyOnUpdate="0" field="csv_captain"/>
-        <default expression="" applyOnUpdate="0" field="csv_captain_phone"/>
-        <default expression="" applyOnUpdate="0" field="csv_race"/>
-        <default expression="" applyOnUpdate="0" field="csv_last_runner"/>
-        <default expression="" applyOnUpdate="0" field="csv_instructions"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="notes"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="GROUP"/>
+        <default applyOnUpdate="0" expression="" field="csv_day"/>
+        <default applyOnUpdate="0" expression="" field="csv_position"/>
+        <default applyOnUpdate="0" expression="" field="csv_club"/>
+        <default applyOnUpdate="0" expression="" field="csv_captain"/>
+        <default applyOnUpdate="0" expression="" field="csv_captain_phone"/>
+        <default applyOnUpdate="0" expression="" field="csv_race"/>
+        <default applyOnUpdate="0" expression="" field="csv_first_runner"/>
+        <default applyOnUpdate="0" expression="" field="csv_last_runner"/>
+        <default applyOnUpdate="0" expression="" field="csv_instructions"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="notes" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="GROUP" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_club" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_captain" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_captain_phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_race" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_last_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_instructions" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="notes" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="GROUP" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_position" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_club" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_captain" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_captain_phone" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_race" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_first_runner" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_last_runner" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_instructions" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -12811,30 +12816,32 @@ def my_form_open(dialog, layer, feature):
         <constraint desc="" exp="" field="csv_captain"/>
         <constraint desc="" exp="" field="csv_captain_phone"/>
         <constraint desc="" exp="" field="csv_race"/>
+        <constraint desc="" exp="" field="csv_first_runner"/>
         <constraint desc="" exp="" field="csv_last_runner"/>
         <constraint desc="" exp="" field="csv_instructions"/>
       </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" sortExpression="&quot;position&quot;" sortOrder="0">
         <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="GROUP" type="field" hidden="0"/>
-          <column width="-1" name="csv_day" type="field" hidden="0"/>
-          <column width="-1" name="csv_position" 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_race" 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="day" type="field" hidden="0"/>
+          <column name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="position" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="notes" hidden="0" width="-1" type="field"/>
+          <column name="GROUP" hidden="0" width="-1" type="field"/>
+          <column name="csv_day" hidden="0" width="-1" type="field"/>
+          <column name="csv_position" hidden="0" width="-1" type="field"/>
+          <column name="csv_club" hidden="0" width="-1" type="field"/>
+          <column name="csv_captain" hidden="0" width="-1" type="field"/>
+          <column name="csv_captain_phone" hidden="0" width="-1" type="field"/>
+          <column name="csv_race" hidden="0" width="-1" type="field"/>
+          <column name="csv_last_runner" hidden="0" width="-1" type="field"/>
+          <column name="csv_instructions" hidden="0" width="-1" type="field"/>
+          <column name="csv_first_runner" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12866,6 +12873,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="GROUP" editable="1"/>
         <field name="csv_10_distance" editable="0"/>
         <field name="csv_21_distance" editable="0"/>
         <field name="csv_Description" editable="0"/>
@@ -12913,6 +12921,7 @@ def my_form_open(dialog, layer, feature):
         <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
+        <field name="GROUP" labelOnTop="0"/>
         <field name="csv_10_distance" labelOnTop="0"/>
         <field name="csv_21_distance" labelOnTop="0"/>
         <field name="csv_Description" labelOnTop="0"/>
@@ -12960,38 +12969,39 @@ def my_form_open(dialog, layer, feature):
         <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
       <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_day"/>
-        <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_race"/>
-        <field reuseLastValue="0" name="csv_races"/>
-        <field reuseLastValue="0" name="csv_surname"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
-        <field reuseLastValue="0" name="marshals_by_position_club"/>
-        <field reuseLastValue="0" name="marshals_by_position_day"/>
-        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
-        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_position"/>
-        <field reuseLastValue="0" name="marshals_by_position_race"/>
-        <field reuseLastValue="0" name="notes"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="type"/>
-        <field reuseLastValue="0" name="xyposition"/>
+        <field name="GROUP" reuseLastValue="0"/>
+        <field name="csv_captain" reuseLastValue="0"/>
+        <field name="csv_captain_email" reuseLastValue="0"/>
+        <field name="csv_captain_phone" reuseLastValue="0"/>
+        <field name="csv_club" reuseLastValue="0"/>
+        <field name="csv_day" reuseLastValue="0"/>
+        <field name="csv_days" reuseLastValue="0"/>
+        <field name="csv_email" reuseLastValue="0"/>
+        <field name="csv_first_runner" reuseLastValue="0"/>
+        <field name="csv_firstname" reuseLastValue="0"/>
+        <field name="csv_instructions" reuseLastValue="0"/>
+        <field name="csv_last_runner" reuseLastValue="0"/>
+        <field name="csv_name" reuseLastValue="0"/>
+        <field name="csv_phone" reuseLastValue="0"/>
+        <field name="csv_position" reuseLastValue="0"/>
+        <field name="csv_race" reuseLastValue="0"/>
+        <field name="csv_races" reuseLastValue="0"/>
+        <field name="csv_surname" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain_phone" reuseLastValue="0"/>
+        <field name="marshals_by_position_club" reuseLastValue="0"/>
+        <field name="marshals_by_position_day" reuseLastValue="0"/>
+        <field name="marshals_by_position_first_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_instructions" reuseLastValue="0"/>
+        <field name="marshals_by_position_last_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_position" reuseLastValue="0"/>
+        <field name="marshals_by_position_race" reuseLastValue="0"/>
+        <field name="notes" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
+        <field name="xyposition" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -13041,7 +13051,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" geometry="No geometry" type="vector" readOnly="0" refreshOnNotifyEnabled="0" wkbType="NoGeometry">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="NoGeometry" styleCategories="AllStyleCategories" readOnly="0" autoRefreshTime="0" geometry="No geometry" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" type="vector" minScale="1e+08">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -13095,7 +13105,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13120,138 +13130,138 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13260,18 +13270,18 @@ 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 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="first_name" 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>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13289,8 +13299,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>
@@ -13313,8 +13323,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>
@@ -13337,8 +13347,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>
@@ -13380,19 +13390,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="day"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="first_name"/>
-        <alias name="" index="3" field="surname"/>
-        <alias name="" index="4" field="club"/>
-        <alias name="" index="5" field="phone"/>
-        <alias name="" index="6" field="email"/>
-        <alias name="" index="7" field="captain"/>
-        <alias name="" index="8" field="captain_phone"/>
-        <alias name="" index="9" field="race"/>
-        <alias name="" index="10" field="first_runner"/>
-        <alias name="" index="11" field="last_runner"/>
-        <alias name="" index="12" field="instructions"/>
+        <alias index="0" name="" field="day"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="first_name"/>
+        <alias index="3" name="" field="surname"/>
+        <alias index="4" name="" field="club"/>
+        <alias index="5" name="" field="phone"/>
+        <alias index="6" name="" field="email"/>
+        <alias index="7" name="" field="captain"/>
+        <alias index="8" name="" field="captain_phone"/>
+        <alias index="9" name="" field="race"/>
+        <alias index="10" name="" field="first_runner"/>
+        <alias index="11" name="" field="last_runner"/>
+        <alias index="12" name="" field="instructions"/>
       </aliases>
       <splitPolicies>
         <policy field="day" policy="Duplicate"/>
@@ -13410,34 +13420,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="first_name"/>
-        <default expression="" applyOnUpdate="0" field="surname"/>
-        <default expression="" applyOnUpdate="0" field="club"/>
-        <default expression="" applyOnUpdate="0" field="phone"/>
-        <default expression="" applyOnUpdate="0" field="email"/>
-        <default expression="" applyOnUpdate="0" field="captain"/>
-        <default expression="" applyOnUpdate="0" field="captain_phone"/>
-        <default expression="" applyOnUpdate="0" field="race"/>
-        <default expression="" applyOnUpdate="0" field="first_runner"/>
-        <default expression="" applyOnUpdate="0" field="last_runner"/>
-        <default expression="" applyOnUpdate="0" field="instructions"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="first_name"/>
+        <default applyOnUpdate="0" expression="" field="surname"/>
+        <default applyOnUpdate="0" expression="" field="club"/>
+        <default applyOnUpdate="0" expression="" field="phone"/>
+        <default applyOnUpdate="0" expression="" field="email"/>
+        <default applyOnUpdate="0" expression="" field="captain"/>
+        <default applyOnUpdate="0" expression="" field="captain_phone"/>
+        <default applyOnUpdate="0" expression="" field="race"/>
+        <default applyOnUpdate="0" expression="" field="first_runner"/>
+        <default applyOnUpdate="0" expression="" field="last_runner"/>
+        <default applyOnUpdate="0" expression="" field="instructions"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="first_name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="surname" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="club" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="email" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="captain" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="captain_phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="race" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="first_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="last_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="instructions" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="surname" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="club" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="phone" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="email" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="captain" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="captain_phone" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="race" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_runner" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="last_runner" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="instructions" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="day"/>
@@ -13456,24 +13466,24 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns>
-          <column width="-1" name="position" 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" 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="surname" type="field" hidden="0"/>
-          <column width="-1" name="day" type="field" hidden="0"/>
-          <column width="-1" name="first_name" type="field" hidden="0"/>
-          <column width="-1" name="race" type="field" hidden="0"/>
-          <column width="-1" name="captain_phone" type="field" hidden="0"/>
+          <column name="position" hidden="0" width="-1" type="field"/>
+          <column name="club" hidden="0" width="-1" type="field"/>
+          <column name="phone" hidden="0" width="-1" type="field"/>
+          <column name="email" hidden="0" width="-1" type="field"/>
+          <column name="captain" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="first_runner" hidden="0" width="-1" type="field"/>
+          <column name="last_runner" hidden="0" width="-1" type="field"/>
+          <column name="instructions" hidden="0" width="-1" type="field"/>
+          <column name="surname" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="first_name" hidden="0" width="-1" type="field"/>
+          <column name="race" hidden="0" width="-1" type="field"/>
+          <column name="captain_phone" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13553,28 +13563,28 @@ def my_form_open(dialog, layer, feature):
         <field name="tshirt" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="captain"/>
-        <field reuseLastValue="0" name="captain_email"/>
-        <field reuseLastValue="0" name="captain_phone"/>
-        <field reuseLastValue="0" name="club"/>
-        <field reuseLastValue="0" name="days"/>
-        <field reuseLastValue="0" name="email"/>
-        <field reuseLastValue="0" name="first_runner"/>
-        <field reuseLastValue="0" name="firstname"/>
-        <field reuseLastValue="0" name="instructions"/>
-        <field reuseLastValue="0" name="last_runner"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="phone"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="surname"/>
+        <field name="captain" reuseLastValue="0"/>
+        <field name="captain_email" reuseLastValue="0"/>
+        <field name="captain_phone" reuseLastValue="0"/>
+        <field name="club" reuseLastValue="0"/>
+        <field name="days" reuseLastValue="0"/>
+        <field name="email" reuseLastValue="0"/>
+        <field name="first_runner" reuseLastValue="0"/>
+        <field name="firstname" reuseLastValue="0"/>
+        <field name="instructions" reuseLastValue="0"/>
+        <field name="last_runner" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="phone" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="surname" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13640,7 +13650,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13665,326 +13675,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
-          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
+          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
+          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{743d2826-031c-45d5-809e-09f032abdd16}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{743d2826-031c-45d5-809e-09f032abdd16}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" 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 enabled="1" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@1@1@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{03389801-e1b4-43c1-bed5-409ab2a31647}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -13997,11 +14007,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>
@@ -14009,54 +14019,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14064,16 +14074,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14096,20 +14106,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -14117,13 +14127,13 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14168,7 +14178,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14234,7 +14244,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14259,279 +14269,279 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="name" fontItalic="0" fontSize="8.5" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.75" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="8.5" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.75" fieldName="name" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1.5" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="1" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.20000000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="1" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="UnknownGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="0.20000000000000001" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&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;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>
@@ -14539,54 +14549,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14594,16 +14604,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14614,8 +14624,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>
@@ -14624,8 +14634,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>
@@ -14634,8 +14644,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>
@@ -14644,8 +14654,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>
@@ -14654,8 +14664,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>
@@ -14664,8 +14674,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>
@@ -14674,8 +14684,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>
@@ -14684,8 +14694,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>
@@ -14694,23 +14704,23 @@ 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>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="osm_id"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="type"/>
-        <alias name="" index="4" field="z_order"/>
-        <alias name="" index="5" field="population"/>
-        <alias name="" index="6" field="label_x"/>
-        <alias name="" index="7" field="label_y"/>
-        <alias name="" index="8" field="label_rota"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="osm_id"/>
+        <alias index="2" name="" field="name"/>
+        <alias index="3" name="" field="type"/>
+        <alias index="4" name="" field="z_order"/>
+        <alias index="5" name="" field="population"/>
+        <alias index="6" name="" field="label_x"/>
+        <alias index="7" name="" field="label_y"/>
+        <alias index="8" name="" field="label_rota"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -14724,26 +14734,26 @@ def my_form_open(dialog, layer, feature):
         <policy field="label_rota" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="osm_id"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="z_order"/>
-        <default expression="" applyOnUpdate="0" field="population"/>
-        <default expression="" applyOnUpdate="0" field="label_x"/>
-        <default expression="" applyOnUpdate="0" field="label_y"/>
-        <default expression="" applyOnUpdate="0" field="label_rota"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="population"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="population" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="osm_id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="z_order" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="population" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_x" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_y" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_rota" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -14758,20 +14768,20 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="osm_id" hidden="0" width="-1" type="field"/>
+          <column name="name" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="z_order" hidden="0" width="-1" type="field"/>
+          <column name="population" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="label_x" hidden="0" width="-1" type="field"/>
+          <column name="label_y" hidden="0" width="-1" type="field"/>
+          <column name="label_rota" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14830,7 +14840,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14896,7 +14906,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14921,319 +14931,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{354d4d11-8126-426c-b325-0776a64e32e3}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontItalic="0" fontSize="7" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.80000000000000004" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="7" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="0.80000000000000004" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MapUnit" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="3" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="3" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="5" obstacle="1" mergeLines="1" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.29999999999999999" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="3" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MapUnit" offsetUnits="MapUnit" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="4" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="3" layerType="LineGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="0.29999999999999999" minFeatureSize="5" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="1" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&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;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>
-          <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>
@@ -15241,54 +15251,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15296,16 +15306,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15316,8 +15326,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>
@@ -15326,8 +15336,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>
@@ -15371,8 +15381,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>
@@ -15435,22 +15445,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="osm_id"/>
-        <alias name="" index="1" field="name"/>
-        <alias name="" index="2" field="highway"/>
-        <alias name="" index="3" field="waterway"/>
-        <alias name="" index="4" field="aerialway"/>
-        <alias name="" index="5" field="barrier"/>
-        <alias name="" index="6" field="man_made"/>
-        <alias name="" index="7" field="z_order"/>
-        <alias name="" index="8" field="other_tags"/>
-        <alias name="" index="9" field="never_show"/>
-        <alias name="" index="10" field="label_x"/>
-        <alias name="" index="11" field="label_y"/>
-        <alias name="" index="12" field="label_rota"/>
-        <alias name="" index="13" field="always_sho"/>
-        <alias name="" index="14" field="resident_a"/>
-        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
+        <alias index="0" name="" field="osm_id"/>
+        <alias index="1" name="" field="name"/>
+        <alias index="2" name="" field="highway"/>
+        <alias index="3" name="" field="waterway"/>
+        <alias index="4" name="" field="aerialway"/>
+        <alias index="5" name="" field="barrier"/>
+        <alias index="6" name="" field="man_made"/>
+        <alias index="7" name="" field="z_order"/>
+        <alias index="8" name="" field="other_tags"/>
+        <alias index="9" name="" field="never_show"/>
+        <alias index="10" name="" field="label_x"/>
+        <alias index="11" name="" field="label_y"/>
+        <alias index="12" name="" field="label_rota"/>
+        <alias index="13" name="" field="always_sho"/>
+        <alias index="14" name="" field="resident_a"/>
+        <alias index="15" name="" field="auxiliary_storage_labeling_show"/>
       </aliases>
       <splitPolicies>
         <policy field="osm_id" policy="Duplicate"/>
@@ -15471,40 +15481,40 @@ def my_form_open(dialog, layer, feature):
         <policy field="auxiliary_storage_labeling_show" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="osm_id"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="highway"/>
-        <default expression="" applyOnUpdate="0" field="waterway"/>
-        <default expression="" applyOnUpdate="0" field="aerialway"/>
-        <default expression="" applyOnUpdate="0" field="barrier"/>
-        <default expression="" applyOnUpdate="0" field="man_made"/>
-        <default expression="" applyOnUpdate="0" field="z_order"/>
-        <default expression="" applyOnUpdate="0" field="other_tags"/>
-        <default expression="" applyOnUpdate="0" field="never_show"/>
-        <default expression="" applyOnUpdate="0" field="label_x"/>
-        <default expression="" applyOnUpdate="0" field="label_y"/>
-        <default expression="" applyOnUpdate="0" field="label_rota"/>
-        <default expression="" applyOnUpdate="0" field="always_sho"/>
-        <default expression="" applyOnUpdate="0" field="resident_a"/>
-        <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_show"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="highway"/>
+        <default applyOnUpdate="0" expression="" field="waterway"/>
+        <default applyOnUpdate="0" expression="" field="aerialway"/>
+        <default applyOnUpdate="0" expression="" field="barrier"/>
+        <default applyOnUpdate="0" expression="" field="man_made"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="other_tags"/>
+        <default applyOnUpdate="0" expression="" field="never_show"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default applyOnUpdate="0" expression="" field="always_sho"/>
+        <default applyOnUpdate="0" expression="" field="resident_a"/>
+        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="highway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="waterway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="aerialway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="barrier" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="man_made" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="other_tags" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="never_show" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="always_sho" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="resident_a" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="osm_id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="highway" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="waterway" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="aerialway" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="barrier" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="man_made" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="z_order" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="other_tags" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="never_show" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_x" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_y" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_rota" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="always_sho" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="resident_a" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_show" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="osm_id"/>
@@ -15526,27 +15536,27 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
         <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="175" 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 name="osm_id" hidden="0" width="-1" type="field"/>
+          <column name="name" hidden="0" width="160" type="field"/>
+          <column name="z_order" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="highway" hidden="0" width="-1" type="field"/>
+          <column name="waterway" hidden="0" width="-1" type="field"/>
+          <column name="aerialway" hidden="0" width="-1" type="field"/>
+          <column name="barrier" hidden="0" width="-1" type="field"/>
+          <column name="man_made" hidden="0" width="-1" type="field"/>
+          <column name="other_tags" hidden="0" width="175" type="field"/>
+          <column name="never_show" hidden="0" width="-1" type="field"/>
+          <column name="label_x" hidden="0" width="-1" type="field"/>
+          <column name="label_y" hidden="0" width="-1" type="field"/>
+          <column name="label_rota" hidden="0" width="-1" type="field"/>
+          <column name="always_sho" hidden="0" width="-1" type="field"/>
+          <column name="resident_a" hidden="0" width="-1" type="field"/>
+          <column name="auxiliary_storage_labeling_show" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15650,22 +15660,22 @@ def my_form_open(dialog, layer, feature):
         <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="aerialway"/>
-        <field reuseLastValue="0" name="always_sho"/>
-        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
-        <field reuseLastValue="0" name="barrier"/>
-        <field reuseLastValue="0" name="highway"/>
-        <field reuseLastValue="0" name="label_rota"/>
-        <field reuseLastValue="0" name="label_x"/>
-        <field reuseLastValue="0" name="label_y"/>
-        <field reuseLastValue="0" name="man_made"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="never_show"/>
-        <field reuseLastValue="0" name="osm_id"/>
-        <field reuseLastValue="0" name="other_tags"/>
-        <field reuseLastValue="0" name="resident_a"/>
-        <field reuseLastValue="0" name="waterway"/>
-        <field reuseLastValue="0" name="z_order"/>
+        <field name="aerialway" reuseLastValue="0"/>
+        <field name="always_sho" reuseLastValue="0"/>
+        <field name="auxiliary_storage_labeling_show" reuseLastValue="0"/>
+        <field name="barrier" reuseLastValue="0"/>
+        <field name="highway" reuseLastValue="0"/>
+        <field name="label_rota" reuseLastValue="0"/>
+        <field name="label_x" reuseLastValue="0"/>
+        <field name="label_y" reuseLastValue="0"/>
+        <field name="man_made" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="never_show" reuseLastValue="0"/>
+        <field name="osm_id" reuseLastValue="0"/>
+        <field name="other_tags" reuseLastValue="0"/>
+        <field name="resident_a" reuseLastValue="0"/>
+        <field name="waterway" reuseLastValue="0"/>
+        <field name="z_order" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -15715,7 +15725,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15781,7 +15791,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15806,511 +15816,511 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <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"/>
+          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" locked="0" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" locked="0" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" locked="0" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="4" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" locked="0" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
               <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>
               <effect enabled="0" type="effectStack">
                 <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>
                 </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>
                 </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>
                 </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>
                 </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>
                 </effect>
               </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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="5" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{810b6ab6-d667-41dd-991f-1013e4243a85}" locked="0" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
               <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>
               <data_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>
@@ -16319,128 +16329,128 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="name" fontItalic="0" fontSize="10" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="name" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="2" shapeType="0" shapeRadiiY="2" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.69999999999999996" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="2" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferNoFill="0" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="1" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="2" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.69999999999999996" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="3" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="3"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="10" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="2" rotationUnit="AngleDegrees" yOffset="3" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="3" xOffset="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" layerType="UnknownGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="10" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&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;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>
@@ -16448,54 +16458,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16503,16 +16513,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16549,10 +16559,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="distance"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="name"/>
+        <alias index="3" name="" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -16561,16 +16571,16 @@ def my_form_open(dialog, layer, feature):
         <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -16580,15 +16590,15 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="name" hidden="0" width="-1" type="field"/>
+          <column name="distance" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16637,7 +16647,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiPolygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -16711,246 +16721,246 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{638d4661-4af7-4b67-a441-09cca39661c7}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{73145fbe-931c-4579-aa0e-58592a465db8}" locked="0" pass="0" class="LinePatternFill">
+            <layer class="LinePatternFill" locked="0" enabled="1" pass="0" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" locked="0" pass="0" class="SimpleLine">
+                <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
                   <Option type="Map">
-                    <Option value="0" name="align_dash_pattern" type="QString"/>
-                    <Option value="square" name="capstyle" type="QString"/>
-                    <Option value="5;2" name="customdash" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="customdash_unit" type="QString"/>
-                    <Option value="0" name="dash_pattern_offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16961,11 +16971,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>
@@ -16973,54 +16983,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17028,16 +17038,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
+      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17053,29 +17063,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="FID"/>
+        <alias index="0" name="" field="FID"/>
       </aliases>
       <splitPolicies>
         <policy field="FID" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="FID"/>
+        <default applyOnUpdate="0" expression="" field="FID"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="FID" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="FID" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="FID"/>
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="431" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17120,7 +17130,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -17186,7 +17196,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17211,612 +17221,612 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" symbol="0"/>
-          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" symbol="1"/>
-          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" symbol="2"/>
-          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" symbol="3"/>
-          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" symbol="4"/>
+          <rule symbol="0" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open"/>
+          <rule symbol="1" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking"/>
+          <rule symbol="2" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed"/>
+          <rule symbol="3" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way"/>
+          <rule symbol="4" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{8668549c-374e-4077-bc7c-96a9bac646a8}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="2" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
               <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>
               <data_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 enabled="1" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{e7a97d22-eba0-4c48-9578-db859faf4112}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="3" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{07696f80-e7db-403b-b380-82695a86ae34}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{07696f80-e7db-403b-b380-82695a86ae34}">
               <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>
               <data_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 enabled="1" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@3@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{e24fa060-35e4-4c51-b944-426558636610}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{e24fa060-35e4-4c51-b944-426558636610}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="4" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_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>
@@ -17825,96 +17835,96 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="times" fontItalic="0" fontSize="9" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="9" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="1" fieldName="times" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="4294967295" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="5" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="UnknownGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&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;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>
@@ -17922,54 +17932,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{27379576-e711-4788-850d-75df56ba927b}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{27379576-e711-4788-850d-75df56ba927b}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17977,16 +17987,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18023,10 +18033,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="status"/>
-        <alias name="" index="3" field="times"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="status"/>
+        <alias index="3" name="" field="times"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -18035,16 +18045,16 @@ def my_form_open(dialog, layer, feature):
         <policy field="times" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="status"/>
-        <default expression="" applyOnUpdate="0" field="times"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="status"/>
+        <default applyOnUpdate="0" expression="" field="times"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="status" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="times" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="status" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="times" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -18054,15 +18064,15 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="202" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="status" hidden="0" width="-1" type="field"/>
+          <column name="times" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18111,7 +18121,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37579747691996346</xmin>
         <ymin>-33.95582399193413892</ymin>
@@ -18185,1020 +18195,1020 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{93207e61-042d-4541-8790-df2a776e7483}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{93207e61-042d-4541-8790-df2a776e7483}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" description="Active routes">
+          <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_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; ILIKE '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; ILIKE '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; ILIKE '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; ILIKE '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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="3" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" description="Show by day">
+          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_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; ILIKE '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; ILIKE '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; ILIKE '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; ILIKE '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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="3" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" active="0" description="List for legends">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" active="0" description="21KM">
+          <rule active="0" description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
+            <rule active="0" description="21KM" filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
               <settings calloutType="simple">
-                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+                <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="210,32,39,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="210,32,39,255" shapeOffsetX="0">
-                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                  <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                  <background shapeFillColor="210,32,39,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="128" shapeBorderColor="210,32,39,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                    <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                         <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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                  <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                   <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="3" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="UnknownGeometry"/>
+                <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
                 <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" active="0" description="10KM">
+            <rule active="0" description="10KM" filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
               <settings calloutType="simple">
-                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+                <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="103,34,144,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="103,34,144,255" shapeOffsetX="0">
-                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                  <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                  <background shapeFillColor="103,34,144,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="128" shapeBorderColor="103,34,144,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                    <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                         <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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                  <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                   <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="UnknownGeometry"/>
+                <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
                 <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" active="0" description="5KM">
+            <rule active="0" description="5KM" filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
               <settings calloutType="simple">
-                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+                <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0">
-                    <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                  <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                  <background shapeFillColor="145,211,55,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="145,211,55,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                    <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                      <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                         <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="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="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="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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                    <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                         <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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                  <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                   <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+                <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
                 <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}" active="0" description="Trail">
+            <rule active="0" description="Trail" filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
               <settings calloutType="simple">
-                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+                <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0">
-                    <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                  <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                  <background shapeFillColor="145,211,55,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="145,211,55,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                    <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                      <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                         <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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                    <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                         <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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                  <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                   <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+                <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
                 <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&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;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>
@@ -19208,13 +19218,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>
@@ -19222,54 +19232,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19277,16 +19287,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19297,8 +19307,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>
@@ -19307,8 +19317,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>
@@ -19317,8 +19327,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>
@@ -19327,8 +19337,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>
@@ -19337,8 +19347,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>
@@ -19361,8 +19371,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>
@@ -19371,8 +19381,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>
@@ -19381,8 +19391,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>
@@ -19391,8 +19401,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>
@@ -19401,26 +19411,26 @@ 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>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="begin"/>
-        <alias name="" index="2" field="end"/>
-        <alias name="" index="3" field="Distance"/>
-        <alias name="" index="4" field="RouteLen"/>
-        <alias name="" index="5" field="Sort"/>
-        <alias name="" index="6" field="day"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="length_m"/>
-        <alias name="" index="10" field="org_fid"/>
-        <alias name="" index="11" field="distance"/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="begin"/>
+        <alias index="2" name="" field="end"/>
+        <alias index="3" name="" field="Distance"/>
+        <alias index="4" name="" field="RouteLen"/>
+        <alias index="5" name="" field="Sort"/>
+        <alias index="6" name="" field="day"/>
+        <alias index="7" name="" field="Source"/>
+        <alias index="8" name="" field="length_km"/>
+        <alias index="9" name="" field="length_m"/>
+        <alias index="10" name="" field="org_fid"/>
+        <alias index="11" name="" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -19437,32 +19447,32 @@ def my_form_open(dialog, layer, feature):
         <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="Name"/>
-        <default expression="" applyOnUpdate="0" field="begin"/>
-        <default expression="" applyOnUpdate="0" field="end"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="Sort"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="org_fid"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Sort" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Sort" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="org_fid" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="Name"/>
@@ -19480,23 +19490,23 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;" sortOrder="0">
         <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="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="Sort" type="field" hidden="0"/>
-          <column width="-1" name="day" type="field" hidden="0"/>
-          <column width="-1" name="length_m" type="field" hidden="0"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="org_fid" hidden="0" width="-1" type="field"/>
+          <column name="distance" hidden="0" width="-1" type="field"/>
+          <column name="Name" hidden="0" width="-1" type="field"/>
+          <column name="Source" hidden="0" width="-1" type="field"/>
+          <column name="RouteLen" hidden="0" width="-1" type="field"/>
+          <column name="begin" hidden="0" width="-1" type="field"/>
+          <column name="end" hidden="0" width="-1" type="field"/>
+          <column name="Distance" hidden="0" width="-1" type="field"/>
+          <column name="length_km" hidden="0" width="-1" type="field"/>
+          <column name="Sort" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="length_m" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19562,28 +19572,28 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <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="distance"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="org_fid"/>
-        <field reuseLastValue="0" name="quadrant"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="distance" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="org_fid" reuseLastValue="0"/>
+        <field name="quadrant" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip enabled="1">Text</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiPolygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -19657,173 +19667,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19834,16 +19844,16 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;id&quot;" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -19875,9 +19885,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="area"/>
-        <alias name="" index="2" field="rotation"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="area"/>
+        <alias index="2" name="" field="rotation"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -19885,14 +19895,14 @@ def my_form_open(dialog, layer, feature):
         <policy field="rotation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="area"/>
-        <default expression="" applyOnUpdate="0" field="rotation"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="area"/>
+        <default applyOnUpdate="0" expression="" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="area" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="rotation" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="area" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="rotation" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -19901,14 +19911,14 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="area" hidden="0" width="-1" type="field"/>
+          <column name="rotation" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19931,7 +19941,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -19997,7 +20007,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -20022,195 +20032,195 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" checkstate="0" label="All distances" symbol="0"/>
+          <rule symbol="0" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{929956be-fb51-4c17-886b-1ed43d282cde}" locked="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="1" enabled="1" pass="0" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
               <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>
               <data_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>
@@ -20222,15 +20232,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>
@@ -20238,54 +20248,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20293,16 +20303,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -20334,8 +20344,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>
@@ -20351,8 +20361,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>
@@ -20361,8 +20371,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>
@@ -20411,19 +20421,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="RouteLen"/>
-        <alias name="" index="6" field="Source"/>
-        <alias name="" index="7" field="length_m"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="org_fid"/>
-        <alias name="" index="10" field="distance"/>
-        <alias name="" index="11" field="first_runn"/>
-        <alias name="" index="12" field="last_runne"/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="descriptio"/>
+        <alias index="2" name="" field="timestamp"/>
+        <alias index="3" name="" field="begin"/>
+        <alias index="4" name="" field="end"/>
+        <alias index="5" name="" field="RouteLen"/>
+        <alias index="6" name="" field="Source"/>
+        <alias index="7" name="" field="length_m"/>
+        <alias index="8" name="" field="length_km"/>
+        <alias index="9" name="" field="org_fid"/>
+        <alias index="10" name="" field="distance"/>
+        <alias index="11" name="" field="first_runn"/>
+        <alias index="12" name="" field="last_runne"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -20441,34 +20451,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="last_runne" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="Name"/>
-        <default expression="" applyOnUpdate="0" field="descriptio"/>
-        <default expression="" applyOnUpdate="0" field="timestamp"/>
-        <default expression="" applyOnUpdate="0" field="begin"/>
-        <default expression="" applyOnUpdate="0" field="end"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="org_fid"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
-        <default expression="" applyOnUpdate="0" field="first_runn"/>
-        <default expression="" applyOnUpdate="0" field="last_runne"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="first_runn"/>
+        <default applyOnUpdate="0" expression="" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="first_runn" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="last_runne" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="descriptio" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="timestamp" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="org_fid" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_runn" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="last_runne" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="Name"/>
@@ -20487,24 +20497,24 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
         <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 name="begin" hidden="0" width="179" type="field"/>
+          <column name="RouteLen" hidden="0" width="-1" type="field"/>
+          <column name="Source" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="Name" hidden="0" width="-1" type="field"/>
+          <column name="length_m" hidden="0" width="-1" type="field"/>
+          <column name="length_km" hidden="0" width="-1" type="field"/>
+          <column name="org_fid" hidden="0" width="-1" type="field"/>
+          <column name="first_runn" hidden="0" width="-1" type="field"/>
+          <column name="last_runne" hidden="0" width="-1" type="field"/>
+          <column name="descriptio" hidden="0" width="-1" type="field"/>
+          <column name="timestamp" hidden="0" width="-1" type="field"/>
+          <column name="end" hidden="0" width="-1" type="field"/>
+          <column name="distance" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20595,7 +20605,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -20669,326 +20679,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{963b9e9e-c03d-476c-a792-effe8028add1}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{7362ff98-e908-498b-82c9-17b74285e0f4}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{20af25c5-139a-4a43-b257-4147f560bd1e}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
-          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
+          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
+          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" 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 enabled="1" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@1@1@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{61856921-c649-4f9a-86f1-1032eeec1eca}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -21001,11 +21011,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>
@@ -21013,54 +21023,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21068,16 +21078,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21100,20 +21110,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -21121,13 +21131,13 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21172,7 +21182,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -21246,236 +21256,236 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="label" fontItalic="0" fontSize="15" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="15" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="1" fieldName="label" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="5" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" layerType="UnknownGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&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;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>
@@ -21483,54 +21493,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21538,16 +21548,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21570,20 +21580,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="label"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="label"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="label" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="label"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -21591,13 +21601,13 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="label" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21642,7 +21652,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiPolygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -21708,7 +21718,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21733,267 +21743,267 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}" description="Show water tables">
+          <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Bold" fontWeight="75" blendMode="0" fontWordSpacing="0" fieldName="label" fontItalic="0" fontSize="8" textColor="31,120,180,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="8" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Bold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="label" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="75" textColor="31,120,180,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0.5" shapeType="0" shapeRadiiY="0.5" shapeSizeY="0.29999999999999999" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.75" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,204" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeBorderColor="31,120,206,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="0.75" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,204" shapeBorderWidth="0.75" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.29999999999999999" shapeJoinStyle="64" shapeBorderColor="31,120,206,255" shapeRadiiY="0.5" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.59999999999999998" shapeSVGFile="" shapeOffsetY="-0.14999999999999999" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PolygonGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="1" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="6" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.76000000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="5" centroidWhole="1" overrunDistanceUnit="MM" quadOffset="1" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" layerType="PolygonGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="5" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="6" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="0.76000000000000001" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&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;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>
@@ -22002,9 +22012,9 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -22012,7 +22022,7 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -22020,54 +22030,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22075,22 +22085,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -22101,8 +22111,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>
@@ -22111,8 +22121,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>
@@ -22121,8 +22131,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>
@@ -22143,11 +22153,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="table_set"/>
-        <alias name="" index="2" field="label"/>
-        <alias name="" index="3" field="races"/>
-        <alias name="" index="4" field="day"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="table_set"/>
+        <alias index="2" name="" field="label"/>
+        <alias index="3" name="" field="races"/>
+        <alias index="4" name="" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -22157,18 +22167,18 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="table_set"/>
-        <default expression="" applyOnUpdate="0" field="label"/>
-        <default expression="" applyOnUpdate="0" field="races"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="table_set"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
+        <default applyOnUpdate="0" expression="" field="races"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="table_set" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="races" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="table_set" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="races" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -22179,16 +22189,16 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
         <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="-1" name="day" type="field" hidden="0"/>
-          <column width="130" name="races" type="field" hidden="0"/>
+          <column name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="table_set" hidden="0" width="-1" type="field"/>
+          <column name="label" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="races" hidden="0" width="130" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22234,11 +22244,11 @@ def my_form_open(dialog, layer, feature):
         <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="label"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="table_set"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="label" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="table_set" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
@@ -22442,7 +22452,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230911 - Gun Run 2023 - Marshal Plan 1.8.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230914 - Gun Run 2023 - Marshal Plan 1.9.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -22611,320 +22621,320 @@ 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="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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <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="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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1"/>
       <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 style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="1">
-      <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="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+    <visibility-preset name="Fencing" has-expanded-info="1" has-checked-group-info="1">
+      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="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="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
         <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer 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="water_tables20170921142016467" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{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>
       <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
+    <visibility-preset name="Marshal map - inset" has-expanded-info="1" has-checked-group-info="1">
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="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" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
       <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="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+      <checked-group-nodes>
+        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Marshal map - main" has-expanded-info="1" has-checked-group-info="1">
+      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="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="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
       <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="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="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal plan" has-checked-group-info="1" has-expanded-info="1">
-      <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="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+    <visibility-preset name="Marshal plan" has-expanded-info="1" has-checked-group-info="1">
+      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-      </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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="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="water_tables20170921142016467" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
       <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Marshals"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="1">
-      <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="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-      </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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset name="Routes" has-expanded-info="1" has-checked-group-info="1">
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="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="water_tables20170921142016467" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
       <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <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="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"/>
+      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <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="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -22954,83 +22964,83 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Marshals" worldFileMap="" printResolution="120" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" groupUuid="" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23038,15 +23048,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="158.226,6.0007,mm" visibility="1" position="158.226,6.0007,mm" itemRotation="0" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" id="" size="132.391,187.018,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="6" sectionWidth="132.391" frame="false" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionY="0" background="false" excludeFromExports="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionHeight="187.018">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" position="158.226,6.0007,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" groupUuid="" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="132.391" size="132.391,187.018,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="184.2" blendMode="0" sectionY="0" positionOnPage="158.226,6.0007,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="6">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23054,15 +23064,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="128.508,3.98741,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="bevel" positionOnPage="128.508,3.98741,mm" minSymbolSize="0" itemRotation="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.1,mm" title="" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="20.4703,32.2333,mm" id="" symbolHeight="4" zValue="5">
-        <FrameColor blue="128" red="128" green="128" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="5" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="true" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frameJoinStyle="bevel" legendFilterByAtlas="0" equalColumnWidth="1" titleAlignment="1" resizeToContents="1" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="128.508,3.98741,mm" rasterBorderColor="0,0,0,255" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="128.508,3.98741,mm" size="20.4703,32.2333,mm" outlineWidthM="0.1,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="128" green="128" red="128"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23073,242 +23083,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.8805579999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.8805579999999997" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="1">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.1750019999999992" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="1" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="9" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.1750019999999992" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="8" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="3.8222239999999998" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="8" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="3.8222239999999998" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -23318,17 +23328,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -23336,166 +23346,166 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.2,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="98.7828,149.027,mm" visibility="1" followPreset="true" position="98.7828,149.027,mm" itemRotation="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" id="Inset map" size="56.5192,54.5647,mm" frameJoinStyle="miter" blendMode="0" zValue="3" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal map - inset" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="98.7828,149.027,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" groupUuid="" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Marshal map - inset" id="Inset map" labelMargin="0,mm" size="56.5192,54.5647,mm" outlineWidthM="0.2,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="98.7828,149.027,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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.41126562861851212" xmin="18.40697388772057153" ymax="-33.9017837760004852" ymin="-33.90592710104210994"/>
+        <Extent ymin="-33.90592710104210994" ymax="-33.9017837760004852" xmax="18.41126562861851212" xmin="18.40697388772057153"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -23503,34 +23513,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" name="Overview 1" show="1" blendMode="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" inverted="0">
-          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <ComposerMapOverview centered="1" name="Overview 1" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" position="3" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23538,9 +23548,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>
@@ -23548,173 +23558,173 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="3.53,6.0007,mm" visibility="1" followPreset="true" position="3.53,6.0007,mm" itemRotation="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" id="Main map" size="142,187.018,mm" frameJoinStyle="miter" blendMode="0" zValue="2" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal map - main" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="3.53,6.0007,mm" mapFlags="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" groupUuid="" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Marshal map - main" id="Main map" labelMargin="0,mm" size="142,187.018,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="3.53,6.0007,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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.40963321822056642" xmin="18.40860629811851723" ymax="-33.90317919753172049" ymin="-33.90453167951087465"/>
+        <Extent ymin="-33.90453167951087465" ymax="-33.90317919753172049" xmax="18.40963321822056642" xmin="18.40860629811851723"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -23722,28 +23732,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="246.665,178.41,mm" visibility="1" mode="1" position="246.665,178.41,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northMode="0" id="" size="47.1065,27.6,mm" pictureRotation="0" pictureHeight="26.6623" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="0" blendMode="0" zValue="1" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_500.png" pictureWidth="47.1065" excludeFromExports="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="246.665,178.41,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" groupUuid="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" opacity="1" pictureWidth="47.1065" northOffset="0" anchorPoint="0" visibility="1" id="" size="47.1065,27.6,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../GunRun2023_500.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="246.665,178.41,mm" excludeFromExports="0" pictureHeight="26.6623" positionLock="true" referencePoint="0" zValue="1" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -23751,14 +23761,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame url="" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#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|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&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;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" resizeMode="0" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
+      <LayoutMultiFrame maxBreakDistance="10" 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;}" resizeMode="0" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#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|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&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;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" useSmartBreaks="true" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}">
         <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23768,112 +23778,112 @@ 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="int"/>
-          <Option value="true" name="imageAntialias" type="bool"/>
-          <Option value="0" name="imageCropMarginBottom" type="int"/>
-          <Option value="0" name="imageCropMarginLeft" type="int"/>
-          <Option value="0" name="imageCropMarginRight" type="int"/>
-          <Option value="0" name="imageCropMarginTop" type="int"/>
-          <Option value="0" name="imageCropMarginUnit" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="bool"/>
-          <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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" 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="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="bool"/>
+          <Option name="atlasRasterFormat" value="jpg" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="bool"/>
+          <Option name="imageCropMarginBottom" value="0" type="int"/>
+          <Option name="imageCropMarginLeft" value="0" type="int"/>
+          <Option name="imageCropMarginRight" value="0" type="int"/>
+          <Option name="imageCropMarginTop" value="0" type="int"/>
+          <Option name="imageCropMarginUnit" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="bool"/>
+          <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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="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="bool"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" enabled="1" coverageLayerName="marshal_positions" hideCoverage="0" sortKey="&quot;position&quot;" pageNameExpression="&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="marshal_positions" coverageLayerProvider="ogr" pageNameExpression="&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" hideCoverage="0" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortKey="&quot;position&quot;" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Start &amp; Finish Backgrounds" worldFileMap="" printResolution="300" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" groupUuid="" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23881,21 +23891,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="286.027,2,mm" visibility="1" mode="0" position="286.027,2,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northMode="0" id="" size="9.45865,11,mm" pictureRotation="330" pictureHeight="7.97477" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="0" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767" excludeFromExports="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="286.027,2,mm" pictureRotation="330" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" groupUuid="" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" opacity="1" pictureWidth="6.31767" northOffset="0" anchorPoint="0" visibility="1" id="" size="9.45865,11,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="arrows/NorthArrow_11.svg" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="0" positionOnPage="286.027,2,mm" excludeFromExports="0" pictureHeight="7.97477" positionLock="true" referencePoint="0" zValue="4" resizeMode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -23903,476 +23913,476 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="285.027,205.886,mm" marginX="1" visibility="1" position="285.027,205.886,mm" itemRotation="270" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" id="" size="142.543,10.3185,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="3" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="[%upper( &quot;area&quot; )%]" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="285.027,205.886,mm" background="false" itemRotation="270" frame="false" frameJoinStyle="miter" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" groupUuid="" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="[%upper( &quot;area&quot; )%]" size="142.543,10.3185,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="285.027,205.886,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 type="65646" outlineWidth="0.3" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="7,189.669,mm" alignment="0" minBarWidth="50" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="1" labelBarSpace="3" height="3" numUnitsPerSegment="100" background="false" groupUuid="" segmentMillimeters="26.3519" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="7,189.669,mm" lineJoinStyle="miter" itemRotation="0" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" maxBarWidth="150" outlineWidthM="0.3,mm" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" numSegments="4" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Single Box" size="145.54,16.2165,mm" id="" zValue="2">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem numUnitsPerSegment="100" zValue="2" background="false" numSegmentsLeft="2" blendMode="0" labelHorizontalPlacement="0" frame="false" minBarWidth="50" labelBarSpace="3" groupUuid="" opacity="1" type="65646" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" maxBarWidth="150" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" frameJoinStyle="miter" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" alignment="0" numSubdivisions="1" numSegments="4" boxContentSpace="1" lineJoinStyle="miter" segmentSizeMode="1" referencePoint="0" unitType="meters" id="" subdivisionsHeight="1.5" visibility="1" outlineWidth="0.3" positionOnPage="7,189.669,mm" segmentMillimeters="26.3519" style="Single Box" labelVerticalPlacement="0" position="7,189.669,mm" lineCapStyle="square" size="145.54,16.2165,mm" outlineWidthM="0.3,mm" unitLabel="m" height="3" positionLock="true" itemRotation="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 blue="0" red="0" green="0" alpha="255"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <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 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" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" red="0" green="0" alpha="255"/>
-        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{89036785-f311-478b-b997-5a2119fbdd2c}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{987cde69-791e-42ba-9c64-bbe76719b954}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="7,5.5,mm" visibility="1" followPreset="true" position="7,5.5,mm" itemRotation="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" id="" size="278.027,180.318,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="330" background="false" excludeFromExports="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Start/Finish" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="7,5.5,mm" mapFlags="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Start/Finish" id="" labelMargin="0,mm" size="278.027,180.318,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="330" positionOnPage="7,5.5,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.40843143571575169" ymax="-33.89880140828828559" ymin="-33.90494830469008747"/>
+        <Extent ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="3" leftFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="1" blendMode="0" intervalY="5" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="4" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="5" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="3" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomAnnotationDisplay="3" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24389,58 +24399,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -24448,117 +24458,117 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
-          <Option value="0" name="svgCropMarginBottom" type="QString"/>
-          <Option value="0" name="svgCropMarginLeft" type="QString"/>
-          <Option value="0" name="svgCropMarginRight" type="QString"/>
-          <Option value="0" name="svgCropMarginTop" type="QString"/>
-          <Option value="true" name="svgCropToContents" type="QString"/>
-          <Option value="0" name="svgDisableRasterTiles" type="QString"/>
-          <Option value="false" name="svgGroupLayers" type="QString"/>
-          <Option value="1" name="svgIncludeMetadata" type="QString"/>
-          <Option value="0" name="svgTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
+          <Option name="svgCropMarginBottom" value="0" type="QString"/>
+          <Option name="svgCropMarginLeft" value="0" type="QString"/>
+          <Option name="svgCropMarginRight" value="0" type="QString"/>
+          <Option name="svgCropMarginTop" value="0" type="QString"/>
+          <Option name="svgCropToContents" value="true" type="QString"/>
+          <Option name="svgDisableRasterTiles" value="0" type="QString"/>
+          <Option name="svgGroupLayers" value="false" type="QString"/>
+          <Option name="svgIncludeMetadata" value="1" type="QString"/>
+          <Option name="svgTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="start_finish_area" hideCoverage="1" sortKey="area" pageNameExpression="&quot;area&quot;" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="start_finish_area" coverageLayerProvider="ogr" pageNameExpression="&quot;area&quot;" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortKey="area" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Cones" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Cones" worldFileMap="" printResolution="300" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" groupUuid="" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{acff6c17-7d68-4552-8826-25f0be803e5b}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24566,15 +24576,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="256.808,5.21277,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="0" referencePoint="0" frameJoinStyle="miter" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" itemRotation="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="38.1563,67.2879,mm" id="" symbolHeight="4" zValue="11">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="11" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="true" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frameJoinStyle="miter" legendFilterByAtlas="0" equalColumnWidth="1" titleAlignment="1" resizeToContents="0" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="256.808,5.21277,mm" rasterBorderColor="0,0,0,255" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" position="256.808,5.21277,mm" size="38.1563,67.2879,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24585,242 +24595,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2.5" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="9" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -24830,33 +24840,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Fencing and Cones" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="fencing" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+                  <Option name="legend/expressionFilter" value="" type="QString"/>
+                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -24864,77 +24874,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,191.188,mm" marginX="0" visibility="1" position="6.76779,191.188,mm" itemRotation="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" id="" size="148.46,6.45211,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="10" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="CONES: [% &quot;name&quot; %]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,191.188,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" groupUuid="" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="CONES: [% &quot;name&quot; %]" size="148.46,6.45211,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="6.76779,191.188,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="10">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="182.723,191.188,mm" visibility="1" position="182.723,191.188,mm" itemRotation="0" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" id="" size="56.3557,6.45237,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="56.3557" frame="false" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" sectionY="0" background="false" excludeFromExports="0" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" sectionHeight="5.76">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" position="182.723,191.188,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" groupUuid="" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="56.3557" size="56.3557,6.45237,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="5.76" blendMode="0" sectionY="0" positionOnPage="182.723,191.188,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="9">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24942,207 +24952,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="212.257,198.083,mm" marginX="0" visibility="1" position="212.257,198.083,mm" itemRotation="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" id="" size="26.8205,6.82826,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="212.257,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" groupUuid="" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="2" labelText="REVISION 1.1" size="26.8205,6.82826,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="212.257,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="116.805,198.083,mm" marginX="0" visibility="1" position="116.805,198.083,mm" itemRotation="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" id="" size="64.7594,7.10512,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="6" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="116.805,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" groupUuid="" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" size="64.7594,7.10512,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="116.805,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="6">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="6.76779,198.083,mm" marginX="0" visibility="1" position="6.76779,198.083,mm" itemRotation="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" id="" size="52.7903,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Page [% @atlas_featurenumber %]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" groupUuid="" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="Page [% @atlas_featurenumber %]" size="52.7903,7.07327,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="6.76779,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="243.098,175.353,mm" visibility="1" mode="1" position="243.098,175.353,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northMode="0" id="" size="49.3143,29.8354,mm" pictureRotation="0" pictureHeight="28.0105" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="243.098,175.353,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" groupUuid="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" opacity="1" pictureWidth="49.3143" northOffset="0" anchorPoint="8" visibility="1" id="" size="49.3143,29.8354,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="243.098,175.353,mm" excludeFromExports="0" pictureHeight="28.0105" positionLock="true" referencePoint="0" zValue="4" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -25150,380 +25160,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.91779,197.79,mm" shapeType="1" visibility="1" position="6.91779,197.79,mm" itemRotation="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" id="" size="232.01,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.91779,197.79,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" groupUuid="" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" visibility="1" id="" size="232.01,0.14328,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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 type="65646" outlineWidth="0.2" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="6.76779,2.8482,mm" alignment="0" minBarWidth="25" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="0.2" labelBarSpace="1" height="2" numUnitsPerSegment="500" background="false" groupUuid="" segmentMillimeters="30.2878" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="6.76779,2.8482,mm" lineJoinStyle="round" itemRotation="0" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" maxBarWidth="100" outlineWidthM="0.3,mm" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" numSegments="2" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Double Box" size="104.399,15.8378,mm" id="" zValue="2">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem numUnitsPerSegment="500" zValue="2" background="false" numSegmentsLeft="2" blendMode="0" labelHorizontalPlacement="0" frame="false" minBarWidth="25" labelBarSpace="1" groupUuid="" opacity="1" type="65646" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" maxBarWidth="100" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" frameJoinStyle="miter" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" alignment="0" numSubdivisions="1" numSegments="2" boxContentSpace="0.2" lineJoinStyle="round" segmentSizeMode="1" referencePoint="0" unitType="meters" id="" subdivisionsHeight="1.5" visibility="1" outlineWidth="0.2" positionOnPage="6.76779,2.8482,mm" segmentMillimeters="30.2878" style="Double Box" labelVerticalPlacement="0" position="6.76779,2.8482,mm" lineCapStyle="square" size="104.399,15.8378,mm" outlineWidthM="0.3,mm" unitLabel="m" height="2" positionLock="true" itemRotation="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 blue="0" red="0" green="0" alpha="255"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <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 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" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" red="0" green="0" alpha="255"/>
-        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ae895973-56d3-4fc1-86c6-c98493abf339}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c0c92035-0ffd-446d-b579-16536dd36b75}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" visibility="1" followPreset="true" position="6.76779,9.35102,mm" itemRotation="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" id="" size="283.418,180.92,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Fencing" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,9.35102,mm" mapFlags="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Fencing" id="" labelMargin="0,mm" size="283.418,180.92,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="6.76779,9.35102,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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.4000263443481451" xmin="18.35799642373368457" ymax="-33.92282769675948373" ymin="-33.94965747213089458"/>
+        <Extent ymin="-33.94965747213089458" ymax="-33.92282769675948373" xmax="18.4000263443481451" xmin="18.35799642373368457"/>
         <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>
@@ -25538,92 +25548,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="3" leftFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="1" blendMode="0" intervalY="5" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="4" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="5" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="3" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomAnnotationDisplay="3" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{e73cb565-3046-4259-89ee-05f5d6c61953}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25640,58 +25650,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -25699,21 +25709,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutMultiFrame url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" evaluateExpressions="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
+      <LayoutMultiFrame maxBreakDistance="10" url="" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" resizeMode="0" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" useSmartBreaks="true" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}">
         <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25723,250 +25733,250 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="rasterize" type="QString"/>
-          <Option value="true" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="true" type="QString"/>
+          <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="cone_groups" hideCoverage="1" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filterFeatures="0" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerName="cone_groups" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" sortKey="&quot;group&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="9" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="9" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{20578607-b7b1-4298-b229-e8f94e47157a}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" groupUuid="" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="4.43449,186.634,mm" marginX="1" visibility="1" position="4.43449,186.634,mm" itemRotation="0" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" id="" size="83.9998,10.4638,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Directions to Start of Race" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="4.43449,186.634,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" groupUuid="" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="Directions to Start of Race" size="83.9998,10.4638,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="4.43449,186.634,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="4.43449,197.498,mm" marginX="1" visibility="1" position="4.43449,197.498,mm" itemRotation="0" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" id="" size="48.2923,9.511,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Gun Run" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="4.43449,197.498,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" groupUuid="" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" marginX="1" valign="32" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="Gun Run" size="48.2923,9.511,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="4.43449,197.498,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="7">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="10.096,10.8563,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="9" rasterBorderWidth="0" boxSpace="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" equalColumnWidth="0" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" legendFilterByMap="1" resizeToContents="1" referencePoint="0" frameJoinStyle="round" positionOnPage="10.096,10.8563,mm" minSymbolSize="0" itemRotation="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="0" positionLock="false" size="59.0766,76,mm" id="" symbolHeight="5" zValue="6">
-        <FrameColor blue="139" red="139" green="139" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="6" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="9" frame="true" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="0" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frameJoinStyle="round" legendFilterByAtlas="0" legendFilterByMap="1" equalColumnWidth="0" titleAlignment="1" resizeToContents="1" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="10.096,10.8563,mm" rasterBorderColor="0,0,0,255" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" position="10.096,10.8563,mm" size="59.0766,76,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="false" itemRotation="0" wmsLegendHeight="25" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolHeight="5" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="139" green="139" red="139"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25977,242 +25987,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="7.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="16" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="7.6444479999999997" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="6.9388920000000001" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="6.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2.5" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="3" marginTop="2.5">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2.5" marginLeft="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="6.9388920000000001" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -26222,32 +26232,32 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Ask Me" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Ask Me" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" name="legend/title-style" type="QString"/>
+                <Option name="legend/title-style" value="hidden" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="poi_labels" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" name="legend/label-0" type="QString"/>
-                  <Option value="Toilets" name="legend/label-1" type="QString"/>
-                  <Option value="Tog Bag Drop-off" name="legend/label-2" type="QString"/>
-                  <Option value="Road Closed to Cars" name="legend/label-3" type="QString"/>
-                  <Option value="MyCiti Drop-off" name="legend/label-4" type="QString"/>
-                  <Option value="Parking" name="legend/label-5" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" value="Start/Finish" type="QString"/>
+                  <Option name="legend/label-1" value="Toilets" type="QString"/>
+                  <Option name="legend/label-2" value="Tog Bag Drop-off" type="QString"/>
+                  <Option name="legend/label-3" value="Road Closed to Cars" type="QString"/>
+                  <Option name="legend/label-4" value="MyCiti Drop-off" type="QString"/>
+                  <Option name="legend/label-5" value="Parking" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="directions_to_start" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" name="legend/label-0" type="QString"/>
-                  <Option value="To 10KM Start (07:30)" name="legend/label-1" type="QString"/>
-                  <Option value="To 5KM Start (08:30)" name="legend/label-2" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
+                  <Option name="legend/label-1" value="To 10KM Start (07:30)" type="QString"/>
+                  <Option name="legend/label-2" value="To 5KM Start (08:30)" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -26255,145 +26265,145 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="221.862,190.027,mm" marginX="1" visibility="1" position="221.862,190.027,mm" itemRotation="0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" id="" size="27.7839,6.871,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="REVISION 1.0" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="221.862,190.027,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" groupUuid="" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" marginX="1" valign="32" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="REVISION 1.0" size="27.7839,6.871,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="221.862,190.027,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="197.975,197.498,mm" marginX="1" visibility="1" position="197.975,197.498,mm" itemRotation="0" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="4" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="197.975,197.498,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" groupUuid="" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="197.975,197.498,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="4">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="249.646,179.724,mm" visibility="1" mode="1" position="249.646,179.724,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northMode="0" id="" size="42.9838,24.3824,mm" pictureRotation="0" pictureHeight="24.3824" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="24.2337" excludeFromExports="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" opacity="1" positionLock="false" type="65640" groupUuid="" northOffset="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="249.646,179.724,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" groupUuid="" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" opacity="1" pictureWidth="24.2337" northOffset="0" anchorPoint="4" visibility="1" id="" size="42.9838,24.3824,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="249.646,179.724,mm" excludeFromExports="0" pictureHeight="24.3824" positionLock="false" referencePoint="0" zValue="3" resizeMode="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -26401,85 +26411,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="4.58449,197.248,mm" shapeType="1" visibility="1" position="4.58449,197.248,mm" itemRotation="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" id="" size="244.912,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="false" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="4.58449,197.248,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" groupUuid="" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" visibility="1" id="" size="244.912,0.1,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="4.58449,197.248,mm" excludeFromExports="0" positionLock="false" referencePoint="0" shapeType="1" zValue="2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{25dc84af-8724-465b-a42c-c6c013132998}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{25dc84af-8724-465b-a42c-c6c013132998}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="4.43449,6.411,mm" visibility="1" followPreset="true" position="4.43449,6.411,mm" itemRotation="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" size="288.007,183.616,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" positionLock="false" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Ask Me" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="4.43449,6.411,mm" mapFlags="0" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Ask Me" id="" labelMargin="0,mm" size="288.007,183.616,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="4.43449,6.411,mm" followPreset="true" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.39762336729721071" ymax="-33.8970204297764468" ymin="-33.90994364588821952"/>
+        <Extent ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -26494,149 +26504,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -26644,318 +26654,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" hideCoverage="0" pageNameExpression="" coverageLayer="" sortFeatures="0" filterFeatures="0"/>
+      <Atlas pageNameExpression="" coverageLayer="" hideCoverage="0" filterFeatures="0" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
     </Layout>
-    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Routes" worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" printResolution="144" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" groupUuid="" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="200.171,199.082,mm" marginX="0" visibility="1" position="200.171,199.082,mm" itemRotation="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" id="" size="61.5373,6.8714,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="13" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.7" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="200.171,199.082,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" groupUuid="" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="2" labelText="REVISION 1.7" size="61.5373,6.8714,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="200.171,199.082,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="13">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="9.7863,192.073,mm" marginX="0" visibility="1" position="9.7863,192.073,mm" itemRotation="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" id="" size="61.5373,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="12" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Gun Run 2023: [%&quot;Source&quot;%]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.7863,192.073,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" groupUuid="" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" htmlState="0" marginX="0" valign="64" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="Gun Run 2023: [%&quot;Source&quot;%]" size="61.5373,6.60801,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="9.7863,192.073,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="12">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="9.7863,199.082,mm" marginX="0" visibility="1" position="9.7863,199.082,mm" itemRotation="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" id="" size="61.5373,6.60801,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="11" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.7863,199.082,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" groupUuid="" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" size="61.5373,6.60801,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="9.7863,199.082,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="11">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="16.8993" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="10" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="29.7523" excludeFromExports="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="262.196,188.218,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" groupUuid="" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" opacity="1" pictureWidth="29.7523" northOffset="0" anchorPoint="4" visibility="1" id="" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="262.196,188.218,mm" excludeFromExports="0" pictureHeight="16.8993" positionLock="true" referencePoint="0" zValue="10" resizeMode="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -26963,374 +26973,374 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.57644,198.832,mm" shapeType="1" visibility="1" position="9.57644,198.832,mm" itemRotation="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" id="" size="251.982,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="9" frame="false" background="false" excludeFromExports="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.57644,198.832,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" groupUuid="" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" visibility="1" id="" size="251.982,0.1,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="9.57644,198.832,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="9">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{04656074-3faa-4640-ae80-a44a8cb036f7}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="8.21644,4.09761,mm" visibility="1" followPreset="true" position="8.21644,4.09761,mm" itemRotation="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" id="Trail Finish" size="109.221,188.689,mm" frameJoinStyle="miter" blendMode="0" zValue="8" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="8.21644,4.09761,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" groupUuid="" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" keepLayerSet="false" drawCanvasItems="true" isTemporal="0" visibility="1" followPresetName="Routes" id="Trail Finish" labelMargin="0,mm" size="109.221,188.689,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="8.21644,4.09761,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41187375074135701" xmin="18.39314911415855391" ymax="-33.90007966676468953" ymin="-33.93242806047424409"/>
+        <Extent ymin="-33.93242806047424409" ymax="-33.90007966676468953" xmax="18.41187375074135701" xmin="18.39314911415855391"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="113.002,2.39423,mm" visibility="1" followPreset="true" position="113.002,2.39423,mm" itemRotation="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" id="Trail Start" size="179.156,191.505,mm" frameJoinStyle="miter" blendMode="0" zValue="7" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="113.002,2.39423,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" groupUuid="" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" keepLayerSet="false" drawCanvasItems="true" isTemporal="0" visibility="1" followPresetName="Routes" id="Trail Start" labelMargin="0,mm" size="179.156,191.505,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="113.002,2.39423,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="7">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42354248737832023" xmin="18.3924263991010406" ymax="-33.92465573363980269" ymin="-33.95791657202656921"/>
+        <Extent ymin="-33.95791657202656921" ymax="-33.92465573363980269" xmax="18.42354248737832023" xmin="18.3924263991010406"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" visibility="1" followPreset="true" position="5.86559,4.09761,mm" itemRotation="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" id="Left inset 21KM" size="67.7828,166.874,mm" frameJoinStyle="miter" blendMode="0" zValue="6" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.86559,4.09761,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" groupUuid="" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Routes" id="Left inset 21KM" labelMargin="0,mm" size="67.7828,166.874,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="5.86559,4.09761,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="6">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38626092146919788" xmin="18.37399999999999878" ymax="-33.91681492292400435" ymin="-33.94700000000000273"/>
+        <Extent ymin="-33.94700000000000273" ymax="-33.91681492292400435" xmax="18.38626092146919788" xmin="18.37399999999999878"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="131.391,120.702,mm" visibility="1" followPreset="true" position="131.391,120.702,mm" itemRotation="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" id="Bottom inset 21KM" size="113.3,76.1023,mm" frameJoinStyle="miter" blendMode="0" zValue="5" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
-        <FrameColor blue="144" red="103" green="34" alpha="255"/>
-        <BackgroundColor blue="215" red="200" green="175" alpha="128"/>
+      <LayoutItem position="131.391,120.702,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" groupUuid="" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" keepLayerSet="false" drawCanvasItems="true" isTemporal="0" visibility="1" followPresetName="Routes" id="Bottom inset 21KM" labelMargin="0,mm" size="113.3,76.1023,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="131.391,120.702,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="144" green="34" red="103"/>
+        <BackgroundColor alpha="128" blue="215" green="175" red="200"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42329132157224336" xmin="18.41509620662891678" ymax="-33.91132718340826813" ymin="-33.9168317482614512"/>
+        <Extent ymin="-33.9168317482614512" ymax="-33.91132718340826813" xmax="18.42329132157224336" xmin="18.41509620662891678"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="8.14144,4.02261,mm" visibility="1" followPreset="true" position="8.14144,4.02261,mm" itemRotation="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" id="Main Map" size="282.732,188.839,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="8.14144,4.02261,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="round" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" groupUuid="" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" keepLayerSet="false" drawCanvasItems="true" isTemporal="0" visibility="1" followPresetName="Routes" id="Main Map" labelMargin="0,mm" size="282.732,188.839,mm" outlineWidthM="0.15,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="8.14144,4.02261,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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 '10500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' 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="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.926'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' 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 value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42312398088981951" xmin="18.37199999999999989" ymax="-33.8918539481981469" ymin="-33.92600000000000193"/>
+        <Extent ymin="-33.92600000000000193" ymax="-33.8918539481981469" xmax="18.42312398088981951" xmin="18.37199999999999989"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -27338,40 +27348,40 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" name="Overview 1" show="1" blendMode="0" centered="1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" inverted="0">
-          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <ComposerMapOverview centered="1" name="Overview 1" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" position="3" inverted="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="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 enabled="1" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27379,9 +27389,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>
@@ -27389,115 +27399,115 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
+        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709" 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 filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" enabled="1" coverageLayerName="all_routes" hideCoverage="0" sortKey="&quot;Sort&quot;" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filterFeatures="1" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="all_routes" coverageLayerProvider="ogr" pageNameExpression="&quot;Distance&quot;" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" filterFeatures="1" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortKey="&quot;Sort&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Marshal Plan A1" worldFileMap="" printResolution="120" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{65fd4b73-0525-4952-b52a-060921d10d24}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" size="594,841,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" groupUuid="" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" visibility="1" id="" size="594,841,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ca38df31-0d5f-4457-be79-18d8add56004}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27505,15 +27515,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="25.5925,18.7971,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="false" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="25.5925,18.7971,mm" minSymbolSize="0" itemRotation="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="4,4,mm" id="" symbolHeight="4" zValue="8">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="8" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="false" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frameJoinStyle="miter" legendFilterByAtlas="0" equalColumnWidth="1" titleAlignment="1" resizeToContents="1" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="25.5925,18.7971,mm" rasterBorderColor="0,0,0,255" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" position="25.5925,18.7971,mm" size="4,4,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27524,242 +27534,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="16" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="6.6444479999999997" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.9388920000000001" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="1">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="1" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -27769,17 +27779,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" checked="Qt::Checked">
+            <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" checked="Qt::Checked" id="all_routes20170907054841602" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="QString"/>
+                  <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27787,207 +27797,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.2963,808.939,mm" marginX="1" visibility="1" position="5.2963,808.939,mm" itemRotation="0" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" id="" size="91.9494,15.0649,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="MARSHAL POSITIONS" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.2963,808.939,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" groupUuid="" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="MARSHAL POSITIONS" size="91.9494,15.0649,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="5.2963,808.939,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="7">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="430.403,825.052,mm" marginX="1" visibility="1" position="430.403,825.052,mm" itemRotation="0" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" id="" size="56.6212,15.3656,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.2" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="430.403,825.052,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" groupUuid="" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" htmlState="0" marginX="1" valign="32" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="REVISION 1.2" size="56.6212,15.3656,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="430.403,825.052,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="372.175,808.942,mm" marginX="1" visibility="1" position="372.175,808.942,mm" itemRotation="0" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" id="" size="114.848,15.0635,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="4" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="372.175,808.942,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" groupUuid="" uuid="{d177957c-7ab6-40ae-8769-347428500538}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="Sunday, 20 October 2019" size="114.848,15.0635,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="372.175,808.942,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="4">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="489.557,775.395,mm" visibility="1" mode="1" position="489.557,775.395,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northMode="0" id="" size="100.498,63.9757,mm" pictureRotation="0" pictureHeight="63.9757" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="63.5856" excludeFromExports="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="489.557,775.395,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" groupUuid="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" opacity="1" pictureWidth="63.5856" northOffset="0" anchorPoint="8" visibility="1" id="" size="100.498,63.9757,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="489.557,775.395,mm" excludeFromExports="0" pictureHeight="63.9757" positionLock="true" referencePoint="0" zValue="3" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -27995,199 +28005,199 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.4463,824.155,mm" shapeType="1" visibility="1" position="5.4463,824.155,mm" itemRotation="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" id="" size="481.428,0.606138,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.4463,824.155,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" groupUuid="" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" opacity="1" visibility="1" id="" size="481.428,0.606138,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="5.4463,824.155,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="3.94474,5.25965,mm" visibility="1" followPreset="true" position="3.94474,5.25965,mm" itemRotation="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" id="" size="584.759,811.213,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal plan" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="3.94474,5.25965,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" groupUuid="" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Marshal plan" id="" labelMargin="0,mm" size="584.759,811.213,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="3.94474,5.25965,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.37434415142052657" ymax="-33.89072661913806428" ymin="-33.95821655848814657"/>
+        <Extent ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="complete_marshal_overview" hideCoverage="1" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filterFeatures="0" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortKey="page" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Access Roads" worldFileMap="" printResolution="144" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" groupUuid="" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{038e2492-f412-42ba-8703-4c8f318a87c2}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="244.484,130.172,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" equalColumnWidth="0" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="244.484,130.172,mm" minSymbolSize="0" itemRotation="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="34.45,40.8,mm" id="" symbolHeight="4" zValue="15">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="185"/>
+      <LayoutItem zValue="15" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="true" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frameJoinStyle="miter" legendFilterByAtlas="0" equalColumnWidth="0" titleAlignment="1" resizeToContents="1" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="244.484,130.172,mm" rasterBorderColor="0,0,0,255" position="244.484,130.172,mm" size="34.45,40.8,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="185" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28195,242 +28205,242 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.9388920000000001" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2.5" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="9" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -28440,15 +28450,15 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Residents Access" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Residents Access" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="residents_access_roads" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28456,207 +28466,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.37446,191.81,mm" marginX="0" visibility="1" position="9.37446,191.81,mm" itemRotation="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" id="" size="194.851,7.272,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="ACCESS ROUTES FOR RESIDENTS" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.37446,191.81,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" groupUuid="" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" htmlState="0" marginX="0" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="ACCESS ROUTES FOR RESIDENTS" size="194.851,7.272,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="9.37446,191.81,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="204.225,191.81,mm" marginX="1" visibility="1" position="204.225,191.81,mm" itemRotation="0" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" id="" size="57.4836,6.8714,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="6" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="204.225,191.81,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" groupUuid="" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="REVISION 1.1" size="57.4836,6.8714,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="204.225,191.81,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="6">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="210.038,199.082,mm" marginX="1" visibility="1" position="210.038,199.082,mm" itemRotation="0" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="210.038,199.082,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" groupUuid="" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="210.038,199.082,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653" excludeFromExports="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="262.196,188.218,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" groupUuid="" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" opacity="1" pictureWidth="17.3653" northOffset="0" anchorPoint="4" visibility="1" id="" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="262.196,188.218,mm" excludeFromExports="0" pictureHeight="17.4718" positionLock="true" referencePoint="0" zValue="4" resizeMode="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -28664,100 +28674,100 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" position="9.59946,198.832,mm" itemRotation="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" id="" size="251.959,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.59946,198.832,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" groupUuid="" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" opacity="1" visibility="1" id="" size="251.959,0.1,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" visibility="1" followPreset="true" position="5.86559,4.09761,mm" itemRotation="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" id="" size="67.7828,166.874,mm" frameJoinStyle="miter" blendMode="0" zValue="2" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Access Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.86559,4.09761,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" groupUuid="" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Access Routes" id="" labelMargin="0,mm" size="67.7828,166.874,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="5.86559,4.09761,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.37288570000000121" ymax="-33.91513741583252539" ymin="-33.94652930000000168"/>
+        <Extent ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -28772,149 +28782,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -28922,45 +28932,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="9.44946,9.08557,mm" visibility="1" followPreset="true" position="9.44946,9.08557,mm" itemRotation="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" id="" size="282.012,175.592,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Access Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.44946,9.08557,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="round" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" groupUuid="" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Access Routes" id="" labelMargin="0,mm" size="282.012,175.592,mm" outlineWidthM="0.15,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="9.44946,9.08557,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.37000000000000099" ymax="-33.89697816224119009" ymin="-33.92999999999999972"/>
+        <Extent ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -28975,149 +28985,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{ebfdf781-190f-4651-9709-789cb68c9533}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -29125,318 +29135,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="1" coverageLayerName="residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="residents_access" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
     </Layout>
-    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{c6a999b7-046a-4375-b775-24bfc19b454c}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" groupUuid="" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{cef79093-d3c5-4edf-9190-66f460844f01}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.37446,191.81,mm" marginX="0" visibility="1" position="9.37446,191.81,mm" itemRotation="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" id="" size="194.851,7.272,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Access to P9 Parking and VIP Tent" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.37446,191.81,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" groupUuid="" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" htmlState="0" marginX="0" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="Access to P9 Parking and VIP Tent" size="194.851,7.272,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="9.37446,191.81,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="204.225,191.81,mm" marginX="1" visibility="1" position="204.225,191.81,mm" itemRotation="0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" id="" size="57.4836,6.8714,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="6" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.0" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="204.225,191.81,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" groupUuid="" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="REVISION 1.0" size="57.4836,6.8714,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="204.225,191.81,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="6">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="210.038,199.082,mm" marginX="1" visibility="1" position="210.038,199.082,mm" itemRotation="0" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="210.038,199.082,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" groupUuid="" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="210.038,199.082,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653" excludeFromExports="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="262.196,188.218,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" groupUuid="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" opacity="1" pictureWidth="17.3653" northOffset="0" anchorPoint="4" visibility="1" id="" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="262.196,188.218,mm" excludeFromExports="0" pictureHeight="17.4718" positionLock="true" referencePoint="0" zValue="4" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -29444,85 +29454,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" position="9.59946,198.832,mm" itemRotation="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" id="" size="251.959,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.59946,198.832,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" groupUuid="" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" opacity="1" visibility="1" id="" size="251.959,0.1,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{025604c1-b118-4f15-b140-54c9145260c4}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{025604c1-b118-4f15-b140-54c9145260c4}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="9.44946,7.25098,mm" visibility="1" followPreset="false" position="9.44946,7.25098,mm" itemRotation="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" id="" size="282.012,182.649,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" positionLock="false" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.44946,7.25098,mm" mapFlags="0" background="true" itemRotation="0" frame="false" frameJoinStyle="round" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" groupUuid="" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="" id="" labelMargin="0,mm" size="282.012,182.649,mm" outlineWidthM="0.15,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="9.44946,7.25098,mm" followPreset="false" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.40103928699269886" ymax="-33.90319854486631357" ymin="-33.90848231674397084"/>
+        <Extent ymin="-33.90848231674397084" ymax="-33.90319854486631357" xmax="18.40919746780259914" xmin="18.40103928699269886"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -29537,149 +29547,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -29687,108 +29697,108 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="0" coverageLayerName="residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="residents_access" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filterFeatures="0" enabled="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
     </Layout>
-    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Marshal Plan" worldFileMap="" printResolution="120" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" size="297,420,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" groupUuid="" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" visibility="1" id="" size="297,420,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29796,15 +29806,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="112.086,406.476,mm" visibility="1" position="112.086,406.476,mm" itemRotation="0" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" id="" size="23.5967,8.3142,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="23.5967" frame="false" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" sectionY="0" background="false" excludeFromExports="0" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" sectionHeight="8.3142">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" position="112.086,406.476,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" groupUuid="" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="23.5967" size="23.5967,8.3142,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="8.3142" blendMode="0" sectionY="0" positionOnPage="112.086,406.476,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="9">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29812,139 +29822,139 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="214.292,406.874,mm" marginX="0" visibility="1" position="214.292,406.874,mm" itemRotation="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" id="" size="27.7839,7.51682,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.8" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="214.292,406.874,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" groupUuid="" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="REVISION 1.10" size="27.7839,7.51682,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="214.292,406.874,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="5.69321,398.344,mm" marginX="0" visibility="1" position="5.69321,398.344,mm" itemRotation="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" id="" size="45.1194,8.13137,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="MARSHAL POSITIONS" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.69321,398.344,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" groupUuid="" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" htmlState="0" marginX="0" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="MARSHAL POSITIONS" size="45.1194,8.13137,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="5.69321,398.344,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="7">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="15.6525,12.5708,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="false" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="15.6525,12.5708,mm" minSymbolSize="0" itemRotation="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="21.8263,33.2917,mm" id="" symbolHeight="4" zValue="6">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="6" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="false" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" frameJoinStyle="miter" legendFilterByAtlas="0" equalColumnWidth="1" titleAlignment="1" resizeToContents="1" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="15.6525,12.5708,mm" rasterBorderColor="0,0,0,255" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" position="15.6525,12.5708,mm" size="21.8263,33.2917,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29955,242 +29965,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="16" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="6.6444479999999997" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.9388920000000001" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="1">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="1" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -30200,19 +30210,19 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option value="group" name="legend/title-style" type="QString"/>
+                <Option name="legend/title-style" value="group" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30220,15 +30230,15 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="5.69321,406.988,mm" visibility="1" position="5.69321,406.988,mm" itemRotation="0" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" id="" size="118.192,7.80192,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="5" sectionWidth="118.192" frame="false" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" sectionY="0" background="false" excludeFromExports="0" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" sectionHeight="7.80192">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" position="5.69321,406.988,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" groupUuid="" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="118.192" size="118.192,7.80192,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="7.80192" blendMode="0" sectionY="0" positionOnPage="5.69321,406.988,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30236,15 +30246,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="148.501,398.344,mm" visibility="1" position="148.501,398.344,mm" itemRotation="0" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" id="" size="93.5757,8.13167,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="4" sectionWidth="93.5757" frame="false" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" sectionY="0" background="false" excludeFromExports="0" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" sectionHeight="8.13167">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" position="148.501,398.344,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" groupUuid="" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="93.5757" size="93.5757,8.13167,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="8.13167" blendMode="0" sectionY="0" positionOnPage="148.501,398.344,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="4">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30252,21 +30262,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="243.319,382.696,mm" visibility="1" mode="1" position="243.319,382.696,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" northMode="0" id="" size="49.3143,31.2967,mm" pictureRotation="0" pictureHeight="27.9119" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../../Gun Run 2023.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="243.319,382.696,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" groupUuid="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" opacity="1" pictureWidth="49.3143" northOffset="0" anchorPoint="8" visibility="1" id="" size="49.3143,31.2967,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../../Gun Run 2023.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="243.319,382.696,mm" excludeFromExports="0" pictureHeight="27.9119" positionLock="true" referencePoint="0" zValue="3" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -30274,101 +30284,101 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.84321,406.626,mm" shapeType="1" visibility="1" position="5.84321,406.626,mm" itemRotation="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" id="" size="236.083,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.84321,406.626,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" groupUuid="" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" opacity="1" visibility="1" id="" size="236.083,0.14328,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="5.84321,406.626,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.03,5.9483,mm" visibility="1" followPreset="true" position="5.03,5.9483,mm" itemRotation="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" id="" size="286.94,392.396,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal plan" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.03,5.9483,mm" mapFlags="0" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" groupUuid="" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Marshal plan" id="" labelMargin="0,mm" size="286.94,392.396,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="5.03,5.9483,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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.41474568521422484" xmin="18.39785407807089612" ymax="-33.89580042337001231" ymin="-33.91890002608484167"/>
+        <Extent ymin="-33.91890002608484167" ymax="-33.89580042337001231" xmax="18.41474568521422484" xmin="18.39785407807089612"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutMultiFrame url="" html="Page [% &quot;page&quot; %] " evaluateExpressions="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }">
+      <LayoutMultiFrame maxBreakDistance="10" url="" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }" resizeMode="0" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="Page [% &quot;page&quot; %] " useSmartBreaks="true" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}">
         <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30376,14 +30386,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame url="" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" evaluateExpressions="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }">
+      <LayoutMultiFrame maxBreakDistance="10" url="" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }" resizeMode="0" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" useSmartBreaks="true" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}">
         <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30391,14 +30401,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame url="" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" evaluateExpressions="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }">
+      <LayoutMultiFrame maxBreakDistance="10" url="" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }" resizeMode="0" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" useSmartBreaks="true" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}">
         <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30408,99 +30418,99 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709" 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 filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="marshal_overviews" hideCoverage="1" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" pageNameExpression="&quot;page&quot;" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Fencing" worldFileMap="" printResolution="300" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" groupUuid="" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30508,15 +30518,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="256.808,5.21277,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="0" referencePoint="0" frameJoinStyle="miter" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" itemRotation="0" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="38.1563,68.0108,mm" id="" symbolHeight="4" zValue="11">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="11" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="true" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" frameJoinStyle="miter" legendFilterByAtlas="0" equalColumnWidth="1" titleAlignment="1" resizeToContents="0" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="256.808,5.21277,mm" rasterBorderColor="0,0,0,255" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" position="256.808,5.21277,mm" size="38.1563,68.0108,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30527,242 +30537,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2.5" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="9" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -30772,33 +30782,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Fencing and Cones" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="fencing" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+                  <Option name="legend/expressionFilter" value="" type="QString"/>
+                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30806,77 +30816,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,191.188,mm" marginX="0" visibility="1" position="6.76779,191.188,mm" itemRotation="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" id="" size="148.46,6.45211,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="10" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="FENCING: [% &quot;name&quot; %]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,191.188,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" groupUuid="" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="FENCING: [% &quot;name&quot; %]" size="148.46,6.45211,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="6.76779,191.188,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="10">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="182.723,191.188,mm" visibility="1" position="182.723,191.188,mm" itemRotation="0" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" id="" size="56.3557,6.45237,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="56.3557" frame="false" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" sectionY="0" background="false" excludeFromExports="0" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" sectionHeight="5.76">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" position="182.723,191.188,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" groupUuid="" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="56.3557" size="56.3557,6.45237,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="5.76" blendMode="0" sectionY="0" positionOnPage="182.723,191.188,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="9">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30884,207 +30894,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="212.258,198.083,mm" marginX="0" visibility="1" position="212.258,198.083,mm" itemRotation="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" id="" size="26.8205,6.82826,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="212.258,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" groupUuid="" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="2" labelText="REVISION 1.1" size="26.8205,6.82826,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="212.258,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="62.6706,198.083,mm" marginX="1" visibility="1" position="62.6706,198.083,mm" itemRotation="0" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" id="" size="51.1638,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="62.6706,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" groupUuid="" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" htmlState="0" marginX="1" valign="32" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" size="51.1638,7.07327,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="62.6706,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="7">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="6.76779,198.083,mm" marginX="0" visibility="1" position="6.76779,198.083,mm" itemRotation="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" id="" size="90.2083,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Page [% @atlas_featurenumber %]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" groupUuid="" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="Page [% @atlas_featurenumber %]" size="90.2083,7.07327,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="6.76779,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="243.098,175.353,mm" visibility="1" mode="1" position="243.098,175.353,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" northMode="0" id="" size="49.3143,29.8354,mm" pictureRotation="0" pictureHeight="28.0105" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="243.098,175.353,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" groupUuid="" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" opacity="1" pictureWidth="49.3143" northOffset="0" anchorPoint="8" visibility="1" id="" size="49.3143,29.8354,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="243.098,175.353,mm" excludeFromExports="0" pictureHeight="28.0105" positionLock="true" referencePoint="0" zValue="4" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -31092,380 +31102,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.91779,197.79,mm" shapeType="1" visibility="1" position="6.91779,197.79,mm" itemRotation="0" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" id="" size="232.01,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.91779,197.79,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" groupUuid="" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" opacity="1" visibility="1" id="" size="232.01,0.14328,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{96fb0bca-784b-4a29-b691-c08ef223150d}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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 type="65646" outlineWidth="0.2" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="6.76779,2.8482,mm" alignment="0" minBarWidth="25" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="0.2" labelBarSpace="1" height="2" numUnitsPerSegment="20" background="false" groupUuid="" segmentMillimeters="25.8173" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="6.76779,2.8482,mm" lineJoinStyle="round" itemRotation="0" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" maxBarWidth="100" outlineWidthM="0.3,mm" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" numSegments="2" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Double Box" size="87.2133,15.8378,mm" id="" zValue="2">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem numUnitsPerSegment="20" zValue="2" background="false" numSegmentsLeft="2" blendMode="0" labelHorizontalPlacement="0" frame="false" minBarWidth="25" labelBarSpace="1" groupUuid="" opacity="1" type="65646" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" maxBarWidth="100" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" frameJoinStyle="miter" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" alignment="0" numSubdivisions="1" numSegments="2" boxContentSpace="0.2" lineJoinStyle="round" segmentSizeMode="1" referencePoint="0" unitType="meters" id="" subdivisionsHeight="1.5" visibility="1" outlineWidth="0.2" positionOnPage="6.76779,2.8482,mm" segmentMillimeters="25.8173" style="Double Box" labelVerticalPlacement="0" position="6.76779,2.8482,mm" lineCapStyle="square" size="87.2133,15.8378,mm" outlineWidthM="0.3,mm" unitLabel="m" height="2" positionLock="true" itemRotation="0" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 blue="0" red="0" green="0" alpha="255"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <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 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" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" red="0" green="0" alpha="255"/>
-        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ba8b697f-af10-49bc-b789-55678d099479}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{ba8b697f-af10-49bc-b789-55678d099479}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{7f05af9e-0111-48af-a2c9-889d710570e0}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c90aa551-e7ed-4710-acac-e5698540a53e}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" visibility="1" followPreset="true" position="6.76779,9.35102,mm" itemRotation="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" id="" size="283.418,180.92,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" opacity="0.9" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Fencing" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,9.35102,mm" mapFlags="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" groupUuid="" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" opacity="0.9" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Fencing" id="" labelMargin="0,mm" size="283.418,180.92,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="6.76779,9.35102,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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.37821516684363488" xmin="18.37624285840067628" ymax="-33.94132830492694808" ymin="-33.94258732662760991"/>
+        <Extent ymin="-33.94258732662760991" ymax="-33.94132830492694808" xmax="18.37821516684363488" xmin="18.37624285840067628"/>
         <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>
@@ -31480,92 +31490,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="3" leftFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="1" blendMode="0" intervalY="5" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="4" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="5" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="3" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomAnnotationDisplay="3" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{7f8bc30c-a977-4770-97ae-b052397815c8}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{490d72bf-21ae-4699-adef-94db3e5bc496}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -31582,58 +31592,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -31641,21 +31651,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutMultiFrame url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" evaluateExpressions="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
+      <LayoutMultiFrame maxBreakDistance="10" url="" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" resizeMode="0" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" useSmartBreaks="true" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}">
         <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31665,38 +31675,38 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="rasterize" type="QString"/>
-          <Option value="true" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="true" type="QString"/>
+          <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="fence_groups" hideCoverage="1" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filterFeatures="0" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerName="fence_groups" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" sortKey="&quot;group&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <Sensors/>
-  <ProjectViewSettings rotation="0" UseProjectScales="0">
+  <ProjectViewSettings UseProjectScales="0" rotation="0">
     <Scales/>
-    <DefaultViewExtent xmax="18.3966948564276187" xmin="18.39365183857621489" ymax="-33.90669064043363079" ymin="-33.90828503601445476">
+    <DefaultViewExtent ymin="-33.93407516147076564" ymax="-33.93304222991539376" xmax="18.38092069029205433" xmin="18.37894926663780026">
       <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>
@@ -31710,10 +31720,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
+  <ProjectStyleSettings DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStep="1" cumulativeTemporalRange="0" timeStepUnit="h" frameRate="1"/>
+  <ProjectTimeSettings frameRate="1" timeStepUnit="h" cumulativeTemporalRange="0" timeStep="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
@@ -31723,27 +31733,27 @@ def my_form_open(dialog, layer, feature):
     <BearingFormat id="bearing">
       <Option type="Map">
         <Option name="decimal_separator" type="invalid"/>
-        <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 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" type="invalid"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" name="angle_format" type="QString"/>
+        <Option name="angle_format" value="DecimalDegrees" type="QString"/>
         <Option name="decimal_separator" type="invalid"/>
-        <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 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" type="invalid"/>
       </Option>
     </GeographicCoordinateFormat>
@@ -31761,7 +31771,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationLayerProvider="memory" destinationLayerSource="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,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=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={431ef746-5362-4d7c-bf35-560ac1fcdbbf}" destinationLayer="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" autoAddTrackVertices="0" destinationFollowsActiveLayer="1" autoCommitFeatures="0" destinationLayerName="route_markers">
+  <ProjectGpsSettings autoAddTrackVertices="0" destinationLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" destinationFollowsActiveLayer="1" destinationLayerProvider="ogr" autoCommitFeatures="0" destinationLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" destinationLayerName="marshal_positions">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index bf9e308..6728c71 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" projectname="Gun Run" saveUserFull="Timothy Allen" saveDateTime="2023-09-14T17:03:32" version="3.32.2-Lima">
+<qgis saveUserFull="Timothy Allen" projectname="Gun Run" saveUser="tim" version="3.32.2-Lima" saveDateTime="2023-09-14T20:22:11">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,214 +17,118 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer light-azimuth="315" edl-is-active="1" edl-distance="0.5" edl-distance-unit="0" hillshading-is-multidirectional="0" combined-method="0" edl-strength="1000" hillshading-is-active="0" hillshading-z-factor="1" is-active="0" light-altitude="45"/>
+  <elevation-shading-renderer light-altitude="45" hillshading-is-multidirectional="0" edl-strength="1000" edl-distance-unit="0" light-azimuth="315" combined-method="0" is-active="0" hillshading-z-factor="1" edl-is-active="1" edl-distance="0.5" hillshading-is-active="0"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group name="Marshals" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group expanded="1" name="Marshals" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_exp="" name="marshal_positions" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="marshal_positions" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-            <Option value="1" name="showFeatureCount" type="int"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+            <Option name="showFeatureCount" value="1" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="extra_security20170921130834191" legend_exp="" name="extra_security" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./extra_security.shp" checked="Qt::Unchecked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="extra_security" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./extra_security.shp" checked="Qt::Unchecked" id="extra_security20170921130834191" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshals_by_position20161003112326575" legend_exp="" name="marshals_by_position" legend_split_behavior="0" patch_size="0,0" expanded="1" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" providerKey="delimitedtext">
+      <layer-tree-layer expanded="1" name="marshals_by_position" legend_exp="" legend_split_behavior="0" providerKey="delimitedtext" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" id="marshals_by_position20161003112326575" patch_size="0,0">
         <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-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_exp="" name="complete_marshal_overview" legend_split_behavior="0" patch_size="0,0" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" providerKey="virtual">
+      <layer-tree-layer expanded="1" name="complete_marshal_overview" legend_exp="" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_exp="" name="marshal_overviews" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" providerKey="ogr">
+      <layer-tree-layer expanded="0" name="marshal_overviews" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group expanded="1" name="Fencing and Cones" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="fencing" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-            <Option value="" name="legend/expressionFilter" type="QString"/>
-            <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
+            <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+            <Option name="legend/expressionFilter" value="" type="QString"/>
+            <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" legend_exp="" name="cone_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
+      <layer-tree-layer expanded="1" name="cone_groups" legend_exp="" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" patch_size="-1,-1">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" legend_exp="" name="fence_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
+      <layer-tree-layer expanded="1" name="fence_groups" legend_exp="" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" patch_size="-1,-1">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" legend_exp="" name="fence_and_cone_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
+      <layer-tree-layer expanded="1" name="fence_and_cone_groups" legend_exp="" legend_split_behavior="0" providerKey="virtual" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" patch_size="-1,-1">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group name="Markers" expanded="1" groupLayer="" checked="Qt::Checked">
+      <layer-tree-group expanded="1" name="Markers" checked="Qt::Checked" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" legend_exp="" name="route_markers" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,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=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={431ef746-5362-4d7c-bf35-560ac1fcdbbf}" checked="Qt::Unchecked" providerKey="memory">
+        <layer-tree-layer expanded="1" name="route_markers" legend_exp="" legend_split_behavior="0" providerKey="memory" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,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=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={d1d27919-97ae-4331-93b6-0ce20cde20cc}" checked="Qt::Unchecked" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" patch_size="-1,-1">
           <customproperties>
             <Option type="Map">
               <Option name="expandedLegendNodes" type="invalid"/>
-              <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 id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option value="0" name="showFeatureCount" type="int"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="0" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_exp="" name="timelapse" legend_split_behavior="0" patch_size="0,0" expanded="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">
+    <layer-tree-layer expanded="0" name="timelapse" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" checked="Qt::Unchecked" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0">
       <customproperties>
         <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group name="Feeding Stations" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group expanded="1" name="Feeding Stations" checked="Qt::Checked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="water_tables20170921142016467" legend_exp="" name="water_tables" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./water_tables.shp" checked="Qt::Checked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Ask Me" expanded="0" groupLayer="" checked="Qt::Unchecked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Residents Access" expanded="0" groupLayer="" checked="Qt::Unchecked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_exp="" name="mayor" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./mayor.shp" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_exp="" name="viplabels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./viplabels.shp" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_exp="" name="vipaccess" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./vipaccess.shp" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_exp="" name="golfaccess" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./golfaccess.shp" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_exp="" name="residents_access" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option/>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="OSM data" expanded="1" groupLayer="" checked="Qt::Checked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_exp="" name="osm_roads" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./osm_roads.shp" checked="Qt::Checked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_exp="" name="osm_places" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes"/>
-            <Option value="1" name="showFeatureCount" type="QString"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-    </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" expanded="1" groupLayer="" checked="Qt::Unchecked">
-      <customproperties>
-        <Option/>
-      </customproperties>
-      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_exp="" name="data-comments" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./data-comments.shp" checked="Qt::Unchecked" providerKey="ogr">
-        <customproperties>
-          <Option type="Map">
-            <Option name="expandedLegendNodes" type="invalid"/>
-          </Option>
-        </customproperties>
-      </layer-tree-layer>
-      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_exp="" name="start_finish_area" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./start_finish_area.shp" checked="Qt::Unchecked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="water_tables" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./water_tables.shp" checked="Qt::Checked" id="water_tables20170921142016467" patch_size="0,0">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -232,33 +136,129 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" expanded="0" groupLayer="" checked="Qt::Unchecked">
+    <layer-tree-group expanded="0" name="Ask Me" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_exp="" name="capetownelevation-1m" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" providerKey="ogr">
+      <layer-tree-layer expanded="1" name="poi_labels" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="directions_to_start" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" name="Residents Access" checked="Qt::Unchecked" groupLayer="">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="1" name="mayor" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./mayor.shp" checked="Qt::Unchecked" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="viplabels" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./viplabels.shp" checked="Qt::Unchecked" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option value="1" name="showFeatureCount" type="QString"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="vipaccess" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./vipaccess.shp" checked="Qt::Unchecked" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="0" name="golfaccess" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./golfaccess.shp" checked="Qt::Unchecked" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="residents_access_roads" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="residents_access" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0">
+        <customproperties>
+          <Option/>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="1" name="OSM data" checked="Qt::Checked" groupLayer="">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="0" name="osm_roads" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./osm_roads.shp" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <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" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+            <Option name="showFeatureCount" value="1" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" expanded="1" groupLayer="" checked="Qt::Checked">
+    <layer-tree-group expanded="1" name="Start and Finish pages" checked="Qt::Unchecked" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" providerKey="gdal">
+      <layer-tree-layer expanded="1" name="data-comments" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./data-comments.shp" checked="Qt::Unchecked" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_exp="" name="Outlines" legend_split_behavior="0" patch_size="0,0" expanded="1" 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">
+      <layer-tree-layer expanded="1" name="start_finish_area" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./start_finish_area.shp" checked="Qt::Unchecked" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0">
         <customproperties>
           <Option type="Map">
-            <Option name="expandedLegendNodes"/>
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="0" name="Elevation" checked="Qt::Unchecked" groupLayer="">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="1" name="capetownelevation-1m" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="showFeatureCount" value="1" type="QString"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+    </layer-tree-group>
+    <layer-tree-group expanded="1" name="Map" checked="Qt::Checked" groupLayer="">
+      <customproperties>
+        <Option/>
+      </customproperties>
+      <layer-tree-layer expanded="0" name="GDAL-City of Cape Town 2015 Aerial" legend_exp="" legend_split_behavior="0" providerKey="gdal" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
+          </Option>
+        </customproperties>
+      </layer-tree-layer>
+      <layer-tree-layer expanded="1" name="Outlines" legend_exp="" legend_split_behavior="0" providerKey="wms" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0">
+        <customproperties>
+          <Option type="Map">
+            <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
@@ -293,33 +293,33 @@
       <item>route_markers_022f7471_3d57_403e_b836_6019bd5d0709</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings enabled="0" maxScale="0" mode="3" tolerance="10" self-snapping="1" minScale="0" type="1" intersection-snapping="1" unit="1" scaleDependencyMode="0">
+  <snapping-settings self-snapping="1" unit="1" maxScale="0" intersection-snapping="1" scaleDependencyMode="0" mode="3" enabled="0" type="1" minScale="0" tolerance="10">
     <individual-layer-settings>
-      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" maxScale="0" tolerance="20" minScale="0" type="2" units="1"/>
-      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="0" maxScale="0" tolerance="12" minScale="0" type="0" units="1"/>
-      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="0" maxScale="0" tolerance="12" minScale="0" type="0" units="1"/>
-      <layer-setting id="water_tables20170921142016467" enabled="0" maxScale="0" tolerance="0" minScale="0" type="2" units="2"/>
-      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="extra_security20170921130834191" enabled="0" maxScale="0" tolerance="0" minScale="0" type="2" units="2"/>
-      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
-      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
-      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting maxScale="0" enabled="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="water_tables20170921142016467" units="2" type="2" minScale="0" tolerance="0"/>
+      <layer-setting maxScale="0" enabled="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" units="1" type="0" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="extra_security20170921130834191" units="2" type="2" minScale="0" tolerance="0"/>
+      <layer-setting maxScale="0" enabled="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" type="0" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" type="2" minScale="0" tolerance="20"/>
+      <layer-setting maxScale="0" enabled="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" type="1" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" type="2" minScale="0" tolerance="12"/>
+      <layer-setting maxScale="0" enabled="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" type="2" minScale="0" tolerance="12"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -327,10 +327,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.39449634270076572</xmin>
-      <ymin>-33.90828503601445476</ymin>
-      <xmax>18.39585035230306787</xmax>
-      <ymax>-33.90669064043363079</ymax>
+      <xmin>18.38627766613980441</xmin>
+      <ymin>-33.91538578232235324</ymin>
+      <xmax>18.38852217423664115</xmax>
+      <ymax>-33.91274279235879163</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -351,171 +351,171 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" name="Marshals" checked="Qt::Checked">
-      <legendlayer open="true" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="1"/>
+    <legendgroup name="Marshals" checked="Qt::Checked" open="true">
+      <legendlayer name="marshal_positions" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="1" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
+      <legendlayer name="extra_security" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="extra_security20170921130834191" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="marshals_by_position" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
+      <legendlayer name="marshals_by_position" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="1" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="marshals_by_position20161003112326575" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
+      <legendlayer name="complete_marshal_overview" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
+      <legendlayer name="marshal_overviews" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Fencing and Cones" checked="Qt::Unchecked">
-      <legendlayer open="true" name="fencing" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
+    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="true">
+      <legendlayer name="fencing" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="cone_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" isInOverview="0" visible="0"/>
+      <legendlayer name="cone_groups" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="fence_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0" visible="0"/>
+      <legendlayer name="fence_groups" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="fence_and_cone_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" isInOverview="0" visible="0"/>
+      <legendlayer name="fence_and_cone_groups" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Routes" checked="Qt::Checked">
-      <legendgroup open="true" name="Markers" checked="Qt::Checked">
-        <legendlayer open="true" name="route_markers" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile layerid="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" isInOverview="0" visible="0"/>
+    <legendgroup name="Routes" checked="Qt::Checked" open="true">
+      <legendgroup name="Markers" checked="Qt::Checked" open="true">
+        <legendlayer name="route_markers" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="1" open="true">
+          <filegroup hidden="false" open="true">
+            <legendlayerfile layerid="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="0" isInOverview="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" name="all_routes" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
+      <legendlayer name="all_routes" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer open="false" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-      <filegroup open="false" hidden="false">
-        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
+    <legendlayer name="timelapse" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="false">
+      <filegroup hidden="false" open="false">
+        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0" isInOverview="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" name="Feeding Stations" checked="Qt::Checked">
-      <legendlayer open="true" name="water_tables" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
+    <legendgroup name="Feeding Stations" checked="Qt::Checked" open="true">
+      <legendlayer name="water_tables" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="water_tables20170921142016467" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
-      <legendlayer open="true" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
+    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
+      <legendlayer name="poi_labels" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
+      <legendlayer name="directions_to_start" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
-      <legendlayer open="true" name="mayor" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
+    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
+      <legendlayer name="mayor" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
+      <legendlayer name="viplabels" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
+      <legendlayer name="vipaccess" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
+      <legendlayer name="golfaccess" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
+      <legendlayer name="residents_access_roads" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
+      <legendlayer name="residents_access" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
-      <legendlayer open="false" name="osm_roads" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
+    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
+      <legendlayer name="osm_roads" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="1" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="osm_places" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
+      <legendlayer name="osm_places" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="1" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
-      <legendlayer open="true" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
+    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="true">
+      <legendlayer name="data-comments" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
+      <legendlayer name="start_finish_area" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
-      <legendlayer open="true" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
+    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
+      <legendlayer name="capetownelevation-1m" drawingOrder="-1" checked="Qt::Unchecked" showFeatureCount="1" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Map" checked="Qt::Checked">
-      <legendlayer open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="false" hidden="false">
-          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="1"/>
+    <legendgroup name="Map" checked="Qt::Checked" open="true">
+      <legendlayer name="GDAL-City of Cape Town 2015 Aerial" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" open="false">
+        <filegroup hidden="false" open="false">
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" name="Outlines" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
-        <filegroup open="true" hidden="false">
-          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
+      <legendlayer name="Outlines" drawingOrder="-1" checked="Qt::Checked" showFeatureCount="0" open="true">
+        <filegroup hidden="false" open="true">
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" isInOverview="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="0" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="0" styleCategories="AllStyleCategories" type="annotation" refreshOnNotifyEnabled="0">
+  <main-annotation-layer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" type="annotation" minScale="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -576,7 +576,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyEnabled="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" type="raster" minScale="1e+08">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -642,7 +642,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -667,97 +667,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" enabled="0" zoffset="0" symbology="Line" zscale="1">
+      <elevation zscale="1" band="1" symbology="Line" enabled="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{31a148a7-0364-430a-b534-21f418a5bb1b}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -766,28 +766,28 @@
       </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>
       <mapTip enabled="1"></mapTip>
       <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 enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer blueBand="3" alphaBand="-1" opacity="0.5" type="multibandcolor" redBand="1" nodataColor="" greenBand="2">
+        <rasterrenderer blueBand="3" redBand="1" alphaBand="-1" nodataColor="" opacity="0.5" greenBand="2" type="multibandcolor">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -798,14 +798,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation colorizeGreen="128" colorizeOn="0" colorizeBlue="128" saturation="0" invertColors="0" grayscaleMode="0" colorizeStrength="100" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="0" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyEnabled="0">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="0" styleCategories="AllStyleCategories" autoRefreshTime="0" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" type="raster" minScale="1e+08">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -871,7 +871,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -894,97 +894,97 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" enabled="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation band="1" enabled="0" zoffset="0" symbology="Line" zscale="1">
+      <elevation zscale="1" band="1" symbology="Line" enabled="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -993,28 +993,28 @@
       </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>
       <mapTip enabled="1"></mapTip>
       <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 enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedInResamplingMethod="nearestNeighbour" enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2"/>
         </provider>
-        <rasterrenderer band="1" alphaBand="-1" opacity="0.75" type="singlebandcolordata" nodataColor="">
+        <rasterrenderer band="1" alphaBand="-1" nodataColor="" opacity="0.75" type="singlebandcolordata">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1025,14 +1025,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
+        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
+        <huesaturation colorizeGreen="128" colorizeOn="0" colorizeBlue="128" saturation="0" invertColors="0" grayscaleMode="0" colorizeStrength="100" colorizeRed="255"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1098,7 +1098,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="EPSG:4326" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="EPSG:4326" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1112,8 +1112,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field expression="$length * 100" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_km" type="6"/>
-        <field expression="$length * 100 * 1000" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_m" type="6"/>
+        <field typeName="double precision" name="length_km" comment="" precision="0" expression="$length * 100" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="length_m" comment="" precision="0" expression="$length * 100 * 1000" subType="0" type="6" length="-1"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1126,264 +1126,264 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="RouteLen" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="RouteLen" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2821b303-e942-4f2b-95eb-71ba37854d84}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day" description="Only show when active in Atlas" symbol="0">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" label="21KM" description="This should be disabled, since it's only for legends" symbol="1"/>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" label="10KM" description="This should be disabled, since it's only for legends" symbol="2"/>
-            <rule filter="&quot;Source&quot; ILIKE '5KM%'" key="{871a9276-8278-4528-911c-7e434c0885d3}" checkstate="0" label="5KM" description="This should be disabled, since it's only for legends" symbol="3"/>
-            <rule filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" checkstate="0" label="Trail" description="This should be disabled, since it's only for legends" symbol="4"/>
+          <rule 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)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day">
+            <rule description="This should be disabled, since it's only for legends" symbol="1" checkstate="0" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="21KM"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="2" checkstate="0" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" label="10KM"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="3" checkstate="0" filter="&quot;Source&quot; ILIKE '5KM%'" key="{871a9276-8278-4528-911c-7e434c0885d3}" label="5KM"/>
+            <rule description="This should be disabled, since it's only for legends" symbol="4" checkstate="0" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" label="Trail"/>
           </rule>
-          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" checkstate="0" label="Always show" symbol="5"/>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" checkstate="0" label="Always show by day" symbol="6"/>
+          <rule symbol="5" checkstate="0" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" label="Always show"/>
+          <rule symbol="6" checkstate="0" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" label="Always show by day"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{c07399ea-beb4-4328-8240-a80a1288dc13}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@0@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
                       <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>
                       <data_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; ILIKE '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; ILIKE '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>
@@ -1391,308 +1391,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="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>
               <data_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; ILIKE '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; ILIKE '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="outlineStyle" type="Map">
-                      <Option value="true" name="active" type="bool"/>
-                      <Option value="if (regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#xa;END, '')" 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 , 'day' ), &quot;day&quot; ), CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN 'dash'&#xa;WHEN &quot;Source&quot; = '10KM' THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Fun Run'  THEN 'dot'&#xa;WHEN &quot;Source&quot; = '5KM Dog Walk'  THEN 'dash dot'&#xa;WHEN &quot;Source&quot; = 'Trail' THEN 'dot'&#xa;ELSE 'solid'&#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 enabled="1" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
                   <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>
                   <data_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; ILIKE '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; ILIKE '5KM%'  THEN '#91d337'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '#0048ff'&#xa;ELSE '#000000'&#xa;END" type="QString"/>
+                          <Option name="type" value="3" type="int"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{3d683642-1e02-4313-ae66-4b398724d7bc}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
                   <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>
                   <data_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; ILIKE '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; ILIKE '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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{d9268524-45f1-4731-945d-c43780c8de62}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{d9268524-45f1-4731-945d-c43780c8de62}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
                   <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="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="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="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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@1@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
                       <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>
                       <data_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>
@@ -1700,308 +1700,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="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.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="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.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="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>
               <data_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="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" 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 enabled="1" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="2" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@2@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
                       <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>
                       <data_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>
@@ -2009,308 +2009,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="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>
               <data_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="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" 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 enabled="1" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="3" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@3@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@3@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
                       <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>
                       <data_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>
@@ -2318,308 +2318,308 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="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>
               <data_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="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dash', 'solid' )" 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 enabled="1" id="{09613930-5415-4f16-9126-06282c6e8ebe}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@3@2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@3@3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="4" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@4@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@4@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
                       <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>
                       <data_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>
@@ -2627,302 +2627,302 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="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>
               <data_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="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" name="expression" type="QString"/>
-                      <Option value="3" name="type" type="int"/>
+                      <Option name="active" value="false" type="bool"/>
+                      <Option name="expression" value="if (regexp_match( attribute( @atlas_feature , 'type' ), '^marshal$' ) , 'dot', 'solid' )" 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 enabled="1" id="{536a9089-88ae-403e-a80e-164ca63e1aee}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@4@2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties" type="Map">
                         <Option name="fillColor" type="Map">
-                          <Option value="false" name="active" type="bool"/>
-                          <Option value="1" name="type" type="int"/>
-                          <Option value="" name="val" type="QString"/>
+                          <Option name="active" value="false" type="bool"/>
+                          <Option name="type" value="1" type="int"/>
+                          <Option name="val" value="" type="QString"/>
                         </Option>
                       </Option>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@4@3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="5" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_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; ILIKE '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; ILIKE '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" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="6" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="dash_pattern_offset_unit" type="QString"/>
-                <Option value="0" name="draw_inside_polygon" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="0,0,0,255" name="line_color" type="QString"/>
-                <Option value="solid" name="line_style" type="QString"/>
-                <Option value="0.46" name="line_width" type="QString"/>
-                <Option value="MM" name="line_width_unit" type="QString"/>
-                <Option value="0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="MM" type="QString"/>
+                <Option name="draw_inside_polygon" value="0" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="line_color" value="0,0,0,255" type="QString"/>
+                <Option name="line_style" value="solid" type="QString"/>
+                <Option name="line_width" value="0.46" type="QString"/>
+                <Option name="line_width_unit" value="MM" type="QString"/>
+                <Option name="offset" value="0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <data_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; ILIKE '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; ILIKE '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>
@@ -2934,334 +2934,334 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{064eef02-df9e-463c-8751-4b7fad6f7d48}">
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{9975d16f-40da-4a85-9213-5f1b0f651928}" active="0" description="Active routes">
+          <rule active="0" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{9975d16f-40da-4a85-9213-5f1b0f651928}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round($length / 1000, 0)" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round($length / 1000, 0)" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="km_marker()" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="1" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="0" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="3" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="km_marker()" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="1" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&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;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="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}" active="0" description="Route lengths">
+          <rule active="0" description="Route lengths" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100, 4 )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round( $length * 100, 4 )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="km_marker()" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapAtNoCost" repeatDistance="50" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="0" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="3" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapAtNoCost" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="km_marker()" repeatDistance="50" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&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;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>
@@ -3270,16 +3270,16 @@
       </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>
-          <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>
@@ -3287,54 +3287,54 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{99bd229d-7319-436f-b616-1be11812c381}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{99bd229d-7319-436f-b616-1be11812c381}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -3342,16 +3342,16 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3362,8 +3362,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>
@@ -3372,8 +3372,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>
@@ -3382,8 +3382,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>
@@ -3392,8 +3392,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>
@@ -3402,8 +3402,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>
@@ -3426,8 +3426,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>
@@ -3436,8 +3436,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>
@@ -3446,24 +3446,24 @@
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
+                <Option name="IsMultiline" value="0" type="QString"/>
+                <Option name="UseHtml" value="0" type="QString"/>
               </Option>
             </config>
           </editWidget>
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="begin"/>
-        <alias name="" index="2" field="end"/>
-        <alias name="" index="3" field="Distance"/>
-        <alias name="" index="4" field="RouteLen"/>
-        <alias name="" index="5" field="Sort"/>
-        <alias name="" index="6" field="day"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="length_m"/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="begin"/>
+        <alias index="2" name="" field="end"/>
+        <alias index="3" name="" field="Distance"/>
+        <alias index="4" name="" field="RouteLen"/>
+        <alias index="5" name="" field="Sort"/>
+        <alias index="6" name="" field="day"/>
+        <alias index="7" name="" field="Source"/>
+        <alias index="8" name="" field="length_km"/>
+        <alias index="9" name="" field="length_m"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -3478,28 +3478,28 @@
         <policy field="length_m" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="Name"/>
-        <default expression="" applyOnUpdate="0" field="begin"/>
-        <default expression="" applyOnUpdate="0" field="end"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="Sort"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Sort" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Sort" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="Name"/>
@@ -3514,25 +3514,25 @@
         <constraint desc="" exp="" field="length_m"/>
       </constraintExpressions>
       <expressionfields>
-        <field expression="$length * 100" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_km" type="6"/>
-        <field expression="$length * 100 * 1000" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_m" type="6"/>
+        <field typeName="double precision" name="length_km" comment="" precision="0" expression="$length * 100" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="length_m" comment="" precision="0" expression="$length * 100 * 1000" subType="0" type="6" length="-1"/>
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;" sortOrder="0">
         <columns>
-          <column width="121" name="Name" type="field" hidden="0"/>
-          <column width="141" name="begin" type="field" hidden="0"/>
-          <column width="31" name="end" type="field" hidden="0"/>
-          <column width="66" name="Distance" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="39" name="RouteLen" type="field" hidden="0"/>
-          <column width="250" name="Source" type="field" hidden="0"/>
-          <column width="175" name="length_m" type="field" hidden="0"/>
-          <column width="50" name="Sort" type="field" hidden="0"/>
-          <column width="31" name="day" type="field" hidden="0"/>
-          <column width="266" name="length_km" type="field" hidden="0"/>
+          <column name="Name" hidden="0" width="121" type="field"/>
+          <column name="begin" hidden="0" width="141" type="field"/>
+          <column name="end" hidden="0" width="31" type="field"/>
+          <column name="Distance" hidden="0" width="66" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="RouteLen" hidden="0" width="39" type="field"/>
+          <column name="Source" hidden="0" width="250" type="field"/>
+          <column name="length_m" hidden="0" width="175" type="field"/>
+          <column name="Sort" hidden="0" width="50" type="field"/>
+          <column name="day" hidden="0" width="31" type="field"/>
+          <column name="length_km" hidden="0" width="266" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3592,25 +3592,25 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <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"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3684,189 +3684,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{53b6bbaf-4722-434f-a142-936b95477967}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{53b6bbaf-4722-434f-a142-936b95477967}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -3877,15 +3877,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 name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -3915,9 +3915,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="ID"/>
-        <alias name="" index="1" field="height"/>
-        <alias name="" index="2" field="elevation"/>
+        <alias index="0" name="" field="ID"/>
+        <alias index="1" name="" field="height"/>
+        <alias index="2" name="" field="elevation"/>
       </aliases>
       <splitPolicies>
         <policy field="ID" policy="Duplicate"/>
@@ -3925,14 +3925,14 @@ def my_form_open(dialog, layer, feature):
         <policy field="elevation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="ID"/>
-        <default expression="" applyOnUpdate="0" field="height"/>
-        <default expression="" applyOnUpdate="0" field="elevation"/>
+        <default applyOnUpdate="0" expression="" field="ID"/>
+        <default applyOnUpdate="0" expression="" field="height"/>
+        <default applyOnUpdate="0" expression="" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="ID" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="height" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="elevation" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="ID" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="height" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="elevation" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="ID"/>
@@ -3941,9 +3941,9 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -3966,7 +3966,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Polygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4042,173 +4042,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4219,15 +4219,15 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -4266,10 +4266,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
-        <alias name="" index="3" field="day"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -4278,16 +4278,16 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="page" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -4297,9 +4297,9 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4322,7 +4322,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Polygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4388,7 +4388,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4417,173 +4417,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
               <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="38,162,105,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="cross" name="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="38,162,105,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="cross" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -4594,13 +4594,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="int"/>
+          <Option name="embeddedWidgets/count" value="0" type="int"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -4608,54 +4608,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="5" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="1" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="0" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="5" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="1" spacingUnitScale="3x:0,0,0,0,0,0" direction="0" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -4663,22 +4663,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
+      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -4729,12 +4729,12 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="fence_len"/>
-        <alias name="" index="5" field="cone_len"/>
+        <alias index="0" name="" field="name"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="day"/>
+        <alias index="4" name="" field="fence_len"/>
+        <alias index="5" name="" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -4745,20 +4745,20 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="group"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="fence_len"/>
-        <default expression="" applyOnUpdate="0" field="cone_len"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="name"/>
@@ -4770,16 +4770,16 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns>
-          <column width="306" name="name" type="field" hidden="0"/>
-          <column width="-1" name="group" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="day" type="field" hidden="0"/>
-          <column width="-1" name="cone_len" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="name" hidden="0" width="306" type="field"/>
+          <column name="group" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="cone_len" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -4825,18 +4825,18 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Polygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4912,173 +4912,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
               <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="38,162,105,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="f_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="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="38,162,105,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="f_diagonal" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5089,13 +5089,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="int"/>
+          <Option name="embeddedWidgets/count" value="0" type="int"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -5103,54 +5103,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="5" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="1" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="0" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="5" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="1" spacingUnitScale="3x:0,0,0,0,0,0" direction="0" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5158,22 +5158,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
+      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -5217,11 +5217,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="cone_len"/>
+        <alias index="0" name="" field="name"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="day"/>
+        <alias index="4" name="" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -5231,18 +5231,18 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="group"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="cone_len"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="name"/>
@@ -5253,17 +5253,17 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns>
-          <column width="306" name="name" type="field" hidden="0"/>
-          <column width="-1" name="group" type="field" hidden="0"/>
-          <column width="-1" name="type" type="field" hidden="0"/>
-          <column width="-1" name="day" 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" type="actions" hidden="1"/>
+          <column name="name" hidden="0" width="306" type="field"/>
+          <column name="group" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="cone_len" hidden="0" width="-1" type="field"/>
+          <column name="fence_len" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5309,18 +5309,18 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5386,7 +5386,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5411,189 +5411,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -5604,96 +5604,96 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="Name" fontItalic="0" fontSize="10" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="1" fieldName="Name" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="LineGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="5" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="LineGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="UnknownGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&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;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>
@@ -5701,54 +5701,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -5756,16 +5756,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -5788,20 +5788,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Name"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Name"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="Name" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -5809,13 +5809,13 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="Name" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -5860,7 +5860,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="0">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5926,7 +5926,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5951,319 +5951,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{648e55d2-e73b-45b7-bf24-689efea25f17}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM" description="Only show when active in Atlas" symbol="0"/>
-          <rule filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM" description="Only show when active in Atlas" symbol="1"/>
-          <rule filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM" description="Only show when active in Atlas" symbol="2"/>
+          <rule description="Only show when active in Atlas" symbol="0" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM"/>
+          <rule description="Only show when active in Atlas" symbol="1" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM"/>
+          <rule description="Only show when active in Atlas" symbol="2" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{a6a584bd-d0ac-4682-949e-960321bee388}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@0@1@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{2967078f-5e58-40bd-b0c8-aabffd928676}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6271,147 +6271,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{eab0a889-d082-476e-b081-a39cd87a440e}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@1@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{c53a1ec5-544c-48d2-961a-03466d491afc}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6419,100 +6419,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@1@1@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{43e5e783-9402-4471-b264-9b43c9035744}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{43e5e783-9402-4471-b264-9b43c9035744}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6520,147 +6520,147 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="2" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@2@0@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6668,100 +6668,100 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{579d1121-5712-48ef-b839-b461ebde82d6}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@2@1@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -6769,41 +6769,41 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -6815,11 +6815,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>
@@ -6827,54 +6827,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -6882,16 +6882,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6909,28 +6909,28 @@ 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>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="Distance"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="Distance"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="Distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -6938,13 +6938,13 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
         <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 name="Distance" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7007,7 +7007,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -7081,187 +7081,187 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="0.796078" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="0.796078" name="0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
               <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>
               <data_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>
@@ -7272,268 +7272,268 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
+          <rule description="Show in marshal maps" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="8" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="8" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="1" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="1" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="8" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="1" layerType="UnknownGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
+          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="4" textColor="227,0,185,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="4" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="227,0,185,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.10000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="UnknownGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="2" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&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;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>
@@ -7542,145 +7542,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>
@@ -7688,54 +7688,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -7743,16 +7743,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="10" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="10" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7763,8 +7763,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>
@@ -7773,8 +7773,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>
@@ -7783,17 +7783,17 @@ 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>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -7801,14 +7801,14 @@ def my_form_open(dialog, layer, feature):
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -7817,14 +7817,14 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="&quot;position&quot;" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="position" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7900,7 +7900,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Polygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37682610786999859</xmin>
         <ymin>-33.94240746638465822</ymin>
@@ -7966,7 +7966,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7995,173 +7995,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -8172,13 +8172,13 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="no_action" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="no_action" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;name&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -8186,54 +8186,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{d22f44d7-7a5a-427f-afda-732ba2664339}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -8241,22 +8241,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
+      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -8300,11 +8300,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="name"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="day"/>
-        <alias name="" index="4" field="fence_len"/>
+        <alias index="0" name="" field="name"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="day"/>
+        <alias index="4" name="" field="fence_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -8314,18 +8314,18 @@ def my_form_open(dialog, layer, feature):
         <policy field="fence_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="group"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="fence_len"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="name"/>
@@ -8336,17 +8336,17 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns>
-          <column width="415" 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="day" type="field" hidden="0"/>
-          <column width="-1" name="fence_len" type="field" hidden="0"/>
+          <column name="name" hidden="0" width="415" type="field"/>
+          <column name="group" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="cone_len" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="fence_len" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8394,19 +8394,19 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"name"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8472,7 +8472,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="EPSG:4326" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="EPSG:4326" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8486,47 +8486,47 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="cone_len" type="6"/>
+        <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="cone_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0" type="6" length="-1"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyAlgorithm="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" labelsEnabled="1" simplifyMaxScale="1" minScale="1e+08" simplifyDrawingHints="1" styleCategories="AllStyleCategories" readOnly="0" version="3.8.3-Zanzibar" simplifyLocal="1">
+          <qgis maxScale="0" simplifyDrawingHints="1" labelsEnabled="1" simplifyDrawingTol="1" simplifyMaxScale="1" simplifyAlgorithm="0" readOnly="0" styleCategories="AllStyleCategories" version="3.8.3-Zanzibar" simplifyLocal="1" hasScaleBasedVisibilityFlag="0" minScale="1e+08">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="1">
+            <renderer-v2 enableorderby="0" forceraster="0" symbollevels="1" type="RuleRenderer">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" symbol="0"/>
+                <rule symbol="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible"/>
               </rules>
               <symbols>
-                <symbol name="0" type="line" alpha="1" force_rhr="0" clip_to_extent="1">
-                  <layer enabled="1" locked="0" pass="0" class="SimpleLine">
-                    <prop k="capstyle" v="square"/>
-                    <prop k="customdash" v="5;2"/>
-                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                    <prop k="customdash_unit" v="MM"/>
-                    <prop k="draw_inside_polygon" v="0"/>
-                    <prop k="joinstyle" v="bevel"/>
-                    <prop k="line_color" v="255,255,0,255"/>
-                    <prop k="line_style" v="solid"/>
-                    <prop k="line_width" v="0.5"/>
-                    <prop k="line_width_unit" v="MM"/>
-                    <prop k="offset" v="0"/>
-                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
-                    <prop k="offset_unit" v="MM"/>
-                    <prop k="ring_filter" v="0"/>
-                    <prop k="use_custom_dash" v="0"/>
-                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                <symbol alpha="1" name="0" type="line" force_rhr="0" clip_to_extent="1">
+                  <layer class="SimpleLine" locked="0" enabled="1" pass="0">
+                    <prop v="square" k="capstyle"/>
+                    <prop v="5;2" k="customdash"/>
+                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
+                    <prop v="MM" k="customdash_unit"/>
+                    <prop v="0" k="draw_inside_polygon"/>
+                    <prop v="bevel" k="joinstyle"/>
+                    <prop v="255,255,0,255" k="line_color"/>
+                    <prop v="solid" k="line_style"/>
+                    <prop v="0.5" k="line_width"/>
+                    <prop v="MM" k="line_width_unit"/>
+                    <prop v="0" k="offset"/>
+                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
+                    <prop v="MM" k="offset_unit"/>
+                    <prop v="0" k="ring_filter"/>
+                    <prop v="0" k="use_custom_dash"/>
+                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
                   </layer>
@@ -8537,62 +8537,62 @@ def my_form_open(dialog, layer, feature):
               <rules key="{7b0a59ec-9387-4d8e-badd-0d99ebc42174}">
                 <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{4961744d-6387-45d0-90bf-01e48d575e6e}">
                   <settings>
-                    <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontCapitals="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" namedStyle="Regular" fontWeight="50" blendMode="0" fieldName="comment" fontWordSpacing="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" useSubstitutions="0" isExpression="0" previewBkgrdColor="#ffffff" multilineHeight="1" textOpacity="0.8">
-                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                      <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.6" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.6" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeOffsetX="0"/>
-                      <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135"/>
+                    <text-style fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="#ffffff" isExpression="0" fontCapitals="0" fieldName="comment" textOpacity="0.8" multilineHeight="1" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
+                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="0"/>
+                      <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.6" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="1" shapeJoinStyle="128" shapeBorderColor="255,255,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.6" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM"/>
+                      <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowBlendMode="6" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetUnit="MM" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                    <placement geometryGenerator="" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" rotationAngle="0" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" priority="5" xOffset="0" preserveRotation="1" centroidWhole="0" offsetType="0" centroidInside="0" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="5" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM" repeatDistance="0"/>
-                    <rendering obstacleType="0" displayAll="1" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="1" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                    <text-format decimals="3" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                    <placement dist="5" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" placement="4" placementFlags="2" geometryGeneratorEnabled="0" offsetUnits="MM" rotationAngle="0" preserveRotation="1" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" xOffset="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0" distUnits="MM" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" yOffset="0" repeatDistance="0" geometryGenerator=""/>
+                    <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="1" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" obstacleType="0" drawLabels="1" mergeLines="1" fontMaxPixelSize="10000"/>
                     <dd_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties" type="Map">
                           <Option name="PositionX" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positionx" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positionx" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                           <Option name="PositionY" type="Map">
-                            <Option value="true" name="active" type="bool"/>
-                            <Option value="auxiliary_storage_labeling_positiony" name="field" type="QString"/>
-                            <Option value="2" name="type" type="int"/>
+                            <Option name="active" value="true" type="bool"/>
+                            <Option name="field" value="auxiliary_storage_labeling_positiony" type="QString"/>
+                            <Option name="type" value="2" type="int"/>
                           </Option>
                         </Option>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </dd_properties>
                   </settings>
                 </rule>
                 <rule filter="regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{b0a0c7d3-1b58-4c75-96e0-99907a348e50}">
                   <settings>
-                    <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontCapitals="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" namedStyle="Semibold" fontWeight="63" blendMode="0" fieldName="round( $length, 1) || 'm'" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" useSubstitutions="0" isExpression="1" previewBkgrdColor="#ffffff" multilineHeight="1" textOpacity="1">
-                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                      <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0"/>
-                      <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135"/>
+                    <text-style fontWordSpacing="0" fontItalic="0" fontFamily="Myriad Pro" fontSize="12" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="#ffffff" isExpression="1" fontCapitals="0" fieldName="round( $length, 1) || 'm'" textOpacity="1" multilineHeight="1" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
+                      <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferOpacity="1" bufferSizeUnits="MM" bufferNoFill="1" bufferDraw="1"/>
+                      <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM"/>
+                      <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowBlendMode="6" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowRadiusAlphaOnly="0" shadowOffsetUnit="MM" shadowDraw="0"/>
                       <substitutions/>
                     </text-style>
-                    <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
-                    <placement geometryGenerator="" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" rotationAngle="0" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" priority="5" xOffset="0" preserveRotation="1" centroidWhole="0" offsetType="0" centroidInside="0" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="1" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM" repeatDistance="0"/>
-                    <rendering obstacleType="0" displayAll="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                    <text-format decimals="3" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                    <placement dist="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" fitInPolygonOnly="0" priority="5" placement="2" placementFlags="15" geometryGeneratorEnabled="0" offsetUnits="MM" rotationAngle="0" preserveRotation="1" repeatDistanceUnits="MM" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" xOffset="0" quadOffset="4" geometryGeneratorType="PointGeometry" offsetType="0" distUnits="MM" centroidWhole="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidInside="0" yOffset="0" repeatDistance="0" geometryGenerator=""/>
+                    <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" displayAll="0" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
                     <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>
@@ -8600,30 +8600,30 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property value="id" key="dualview/previewExpressions"/>
-              <property value="0" key="embeddedWidgets/count"/>
+              <property key="dualview/previewExpressions" value="id"/>
+              <property key="embeddedWidgets/count" value="0"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" barWidth="5" backgroundColor="#ffffff" minScaleDenominator="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleDependency="Area" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+              <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
                 <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" obstacle="0" zIndex="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+            <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
               <properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -8707,45 +8707,45 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias name="" index="0" field="id"/>
-              <alias name="" index="1" field="group"/>
-              <alias name="" index="2" field="comment"/>
-              <alias name="" index="3" field="moveable"/>
-              <alias name="" index="4" field="type"/>
-              <alias name="" index="5" field="name"/>
-              <alias name="" index="6" field="hidden"/>
-              <alias name="" index="7" field="auxiliary_storage_labeling_positiony"/>
-              <alias name="" index="8" field="auxiliary_storage_labeling_positionx"/>
-              <alias name="" index="9" field="fence_len"/>
-              <alias name="" index="10" field="cone_len"/>
+              <alias index="0" name="" field="id"/>
+              <alias index="1" name="" field="group"/>
+              <alias index="2" name="" field="comment"/>
+              <alias index="3" name="" field="moveable"/>
+              <alias index="4" name="" field="type"/>
+              <alias index="5" name="" field="name"/>
+              <alias index="6" name="" field="hidden"/>
+              <alias index="7" name="" field="auxiliary_storage_labeling_positiony"/>
+              <alias index="8" name="" field="auxiliary_storage_labeling_positionx"/>
+              <alias index="9" name="" field="fence_len"/>
+              <alias index="10" name="" field="cone_len"/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default expression="" applyOnUpdate="0" field="id"/>
-              <default expression="" applyOnUpdate="0" field="group"/>
-              <default expression="" applyOnUpdate="0" field="comment"/>
-              <default expression="" applyOnUpdate="0" field="moveable"/>
-              <default expression="" applyOnUpdate="0" field="type"/>
-              <default expression="" applyOnUpdate="0" field="name"/>
-              <default expression="" applyOnUpdate="0" field="hidden"/>
-              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positiony"/>
-              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positionx"/>
-              <default expression="" applyOnUpdate="0" field="fence_len"/>
-              <default expression="" applyOnUpdate="0" field="cone_len"/>
+              <default applyOnUpdate="0" expression="" field="id"/>
+              <default applyOnUpdate="0" expression="" field="group"/>
+              <default applyOnUpdate="0" expression="" field="comment"/>
+              <default applyOnUpdate="0" expression="" field="moveable"/>
+              <default applyOnUpdate="0" expression="" field="type"/>
+              <default applyOnUpdate="0" expression="" field="name"/>
+              <default applyOnUpdate="0" expression="" field="hidden"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
+              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
+              <default applyOnUpdate="0" expression="" field="fence_len"/>
+              <default applyOnUpdate="0" expression="" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
-              <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="comment" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="moveable" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="hidden" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positiony" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positionx" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
+              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
             </constraints>
             <constraintExpressions>
               <constraint desc="" exp="" field="id"/>
@@ -8761,27 +8761,27 @@ def my_form_open(dialog, layer, feature):
               <constraint desc="" exp="" field="cone_len"/>
             </constraintExpressions>
             <expressionfields>
-              <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="fence_len" type="6"/>
-              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="fence_len" type="6"/>
-              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="cone_len" type="6"/>
+              <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0" type="6" length="-1"/>
+              <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" type="6" length="-1"/>
+              <field typeName="double precision" name="cone_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0" type="6" length="-1"/>
             </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;">
+            <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
               <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 name="id" hidden="0" width="-1" type="field"/>
+                <column name="group" hidden="0" width="-1" type="field"/>
+                <column hidden="1" width="-1" type="actions"/>
+                <column name="comment" hidden="0" width="223" type="field"/>
+                <column name="moveable" hidden="0" width="-1" type="field"/>
+                <column name="type" hidden="0" width="-1" type="field"/>
+                <column name="name" hidden="0" width="414" type="field"/>
+                <column name="hidden" hidden="0" width="-1" type="field"/>
+                <column name="fence_len" hidden="0" width="-1" type="field"/>
+                <column name="cone_len" hidden="0" width="-1" type="field"/>
+                <column name="auxiliary_storage_labeling_positiony" hidden="1" width="-1" type="field"/>
+                <column name="auxiliary_storage_labeling_positionx" hidden="1" width="-1" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8854,458 +8854,458 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b24077c4-36ed-44b5-830f-d1243f319030}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="1">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="1" referencescale="-1" type="RuleRenderer">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
           <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
-            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones" symbol="0"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences" symbol="1"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences" symbol="2"/>
-            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction" symbol="3"/>
+            <rule symbol="0" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones"/>
+            <rule symbol="1" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences"/>
+            <rule symbol="2" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences"/>
+            <rule symbol="3" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction"/>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible" symbol="4"/>
-          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" label="Always show" symbol="5"/>
+          <rule symbol="4" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible"/>
+          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}" label="Always show"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
               <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>
               <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{67070045-bee5-4271-87d3-86da17eb7dbe}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
               <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>
               <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="2" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="3" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="4" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="5" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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.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="MM" name="offset_unit" type="QString"/>
-                <Option value="0" name="ring_filter" type="QString"/>
-                <Option value="0" name="trim_distance_end" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_end_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_end_unit" type="QString"/>
-                <Option value="0" name="trim_distance_start" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="trim_distance_start_map_unit_scale" type="QString"/>
-                <Option value="MM" name="trim_distance_start_unit" type="QString"/>
-                <Option value="0" name="tweak_dash_pattern_on_corners" type="QString"/>
-                <Option value="0" name="use_custom_dash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="width_map_unit_scale" type="QString"/>
+                <Option name="align_dash_pattern" value="0" type="QString"/>
+                <Option name="capstyle" value="square" type="QString"/>
+                <Option name="customdash" value="5;2" type="QString"/>
+                <Option name="customdash_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="customdash_unit" value="MM" type="QString"/>
+                <Option name="dash_pattern_offset" value="0" type="QString"/>
+                <Option name="dash_pattern_offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="dash_pattern_offset_unit" value="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.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="MM" type="QString"/>
+                <Option name="ring_filter" value="0" type="QString"/>
+                <Option name="trim_distance_end" value="0" type="QString"/>
+                <Option name="trim_distance_end_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_end_unit" value="MM" type="QString"/>
+                <Option name="trim_distance_start" value="0" type="QString"/>
+                <Option name="trim_distance_start_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="trim_distance_start_unit" value="MM" type="QString"/>
+                <Option name="tweak_dash_pattern_on_corners" value="0" type="QString"/>
+                <Option name="use_custom_dash" value="0" type="QString"/>
+                <Option name="width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -9316,667 +9316,667 @@ def my_form_open(dialog, layer, feature):
         <rules key="{b08c8161-de6f-41d9-a933-40d5428d7db9}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{bc58db75-d3ce-4eaf-8459-5b648cb31e6d}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="comment" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.80000000000000004" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.80000000000000004" fieldName="comment" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.59999999999999998" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeOffsetX="0">
-                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.59999999999999998" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="1" shapeJoinStyle="128" shapeBorderColor="255,255,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.59999999999999998" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="5" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="1" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8200000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="4294967295" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="5" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="5" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="UnknownGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1.8200000000000001" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="1" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{05f0d95c-3454-4dd1-90b4-cb8e0b996d06}" description="Fence lengths">
+          <rule description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{05f0d95c-3454-4dd1-90b4-cb8e0b996d06}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="6" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{64b370d3-e3e2-4e7b-81f6-1372a14c327a}" description="Cones lengths">
+          <rule description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{64b370d3-e3e2-4e7b-81f6-1372a14c327a}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="6" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{ed34792d-3215-42ff-8038-8130a45d3742}" active="0">
+          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{ed34792d-3215-42ff-8038-8130a45d3742}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="6" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="&quot;hidden&quot; IS NULL" key="{faa25ceb-8d2c-4cb2-bacb-dd2fe042fd84}" active="0" description="Always show">
+          <rule active="0" description="Always show" filter="&quot;hidden&quot; IS NULL" key="{faa25ceb-8d2c-4cb2-bacb-dd2fe042fd84}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="round( $length * 100 * 1000, 1) || 'm'" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="6" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="14" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="LineGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&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;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>
@@ -9985,13 +9985,13 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="&quot;id&quot;" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -9999,54 +9999,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10054,16 +10054,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10142,16 +10142,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="group"/>
-        <alias name="" index="2" field="comment"/>
-        <alias name="" index="3" field="moveable"/>
-        <alias name="" index="4" field="type"/>
-        <alias name="" index="5" field="name"/>
-        <alias name="" index="6" field="hidden"/>
-        <alias name="" index="7" field="day"/>
-        <alias name="" index="8" field="fence_len"/>
-        <alias name="" index="9" field="cone_len"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="group"/>
+        <alias index="2" name="" field="comment"/>
+        <alias index="3" name="" field="moveable"/>
+        <alias index="4" name="" field="type"/>
+        <alias index="5" name="" field="name"/>
+        <alias index="6" name="" field="hidden"/>
+        <alias index="7" name="" field="day"/>
+        <alias index="8" name="" field="fence_len"/>
+        <alias index="9" name="" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -10166,28 +10166,28 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="group"/>
-        <default expression="" applyOnUpdate="0" field="comment"/>
-        <default expression="" applyOnUpdate="0" field="moveable"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="hidden"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="fence_len"/>
-        <default expression="" applyOnUpdate="0" field="cone_len"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="group"/>
+        <default applyOnUpdate="0" expression="" field="comment"/>
+        <default applyOnUpdate="0" expression="" field="moveable"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="hidden"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default applyOnUpdate="0" expression="" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="comment" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="moveable" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="hidden" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -10202,26 +10202,26 @@ def my_form_open(dialog, layer, feature):
         <constraint desc="" exp="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields>
-        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
-        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="cone_len" type="6"/>
+        <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="fence_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" type="6" length="-1"/>
+        <field typeName="double precision" name="cone_len" comment="" precision="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" subType="0" type="6" length="-1"/>
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <columns>
-          <column width="31" name="id" type="field" hidden="0"/>
-          <column width="52" name="group" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
-          <column width="85" 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="340" name="name" type="field" hidden="0"/>
-          <column width="54" name="hidden" type="field" hidden="0"/>
-          <column width="74" name="fence_len" type="field" hidden="0"/>
-          <column width="40" name="day" type="field" hidden="0"/>
-          <column width="65" name="cone_len" type="field" hidden="0"/>
+          <column name="id" hidden="0" width="31" type="field"/>
+          <column name="group" hidden="0" width="52" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="comment" hidden="0" width="85" type="field"/>
+          <column name="moveable" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="name" hidden="0" width="340" type="field"/>
+          <column name="hidden" hidden="0" width="54" type="field"/>
+          <column name="fence_len" hidden="0" width="74" type="field"/>
+          <column name="day" hidden="0" width="40" type="field"/>
+          <column name="cone_len" hidden="0" width="65" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10283,23 +10283,23 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="comment"/>
-        <field reuseLastValue="0" name="cone_len"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="fence_len"/>
-        <field reuseLastValue="0" name="group"/>
-        <field reuseLastValue="0" name="hidden"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="moveable"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="type"/>
+        <field name="comment" reuseLastValue="0"/>
+        <field name="cone_len" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="fence_len" reuseLastValue="0"/>
+        <field name="group" reuseLastValue="0"/>
+        <field name="hidden" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="moveable" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10373,189 +10373,189 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c73fab62-3b89-497c-a33c-6825e949a9db}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10566,11 +10566,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>
@@ -10578,54 +10578,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -10633,16 +10633,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10658,28 +10658,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
+        <alias index="0" name="" field="id"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
       </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" sortExpression="" sortOrder="0">
         <columns>
-          <column width="-1" name="id" type="field" hidden="0"/>
-          <column width="-1" type="actions" hidden="1"/>
+          <column name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10722,7 +10722,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiPolygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10796,173 +10796,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -10973,9 +10973,9 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -10988,7 +10988,7 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -10996,54 +10996,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -11051,22 +11051,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties" type="Map">
               <Option name="show" type="Map">
-                <Option value="true" name="active" type="bool"/>
-                <Option value="id" name="field" type="QString"/>
-                <Option value="2" name="type" type="int"/>
+                <Option name="active" value="true" type="bool"/>
+                <Option name="field" value="id" type="QString"/>
+                <Option name="type" value="2" type="int"/>
               </Option>
             </Option>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -11077,8 +11077,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>
@@ -11087,8 +11087,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>
@@ -11097,8 +11097,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>
@@ -11112,10 +11112,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="page"/>
-        <alias name="" index="3" field="day"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="page"/>
+        <alias index="3" name="" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -11124,16 +11124,16 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="page"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="page"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="page" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -11143,15 +11143,15 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <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="day" type="field" hidden="0"/>
-          <column width="-1" name="page" type="field" hidden="0"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="id" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="page" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11198,7 +11198,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -11264,7 +11264,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="EPSG:4326" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11275,7 +11275,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join memoryCache="0" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" hasCustomPrefix="1" cascadedDelete="0" targetFieldName="position" upsertOnEdit="1" dynamicForm="0" customPrefix="csv_" editable="1">
+        <join dynamicForm="0" memoryCache="0" joinLayerId="marshals_by_position20161003112326575" upsertOnEdit="0" targetFieldName="position" hasCustomPrefix="1" joinFieldName="position" cascadedDelete="0" customPrefix="csv_" editable="0">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -11283,6 +11283,7 @@ def my_form_open(dialog, layer, feature):
             <field name="captain"/>
             <field name="captain_phone"/>
             <field name="race"/>
+            <field name="first_runner"/>
             <field name="last_runner"/>
             <field name="instructions"/>
           </joinFieldsSubset>
@@ -11302,264 +11303,264 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="id" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="id" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" checkstate="0" label="Show by day in marshal plan" description="Show in marshal overview" symbol="0"/>
-          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" checkstate="0" label="Always show in marshal plan" symbol="1"/>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps" symbol="2"/>
+          <rule description="Show in marshal overview" symbol="0" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" label="Show by day in marshal plan"/>
+          <rule symbol="1" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" label="Always show in marshal plan"/>
+          <rule symbol="2" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="0.8" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="0.8" name="0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" locked="0" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="marker" frame_rate="10" alpha="0.8" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="0.8" name="1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{984895dc-f666-478a-9853-cf8b1ad766f1}" locked="0" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="255,255,255,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0.2" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="5" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="Pixel" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="255,255,255,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0.2" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="5" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="Pixel" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="marker" frame_rate="10" alpha="0.01" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="0.01" name="2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" locked="0" pass="1" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
               <Option type="Map">
-                <Option value="0" name="angle" type="QString"/>
-                <Option value="square" name="cap_style" type="QString"/>
-                <Option value="0,0,0,255" name="color" type="QString"/>
-                <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                <Option value="bevel" name="joinstyle" type="QString"/>
-                <Option value="circle" name="name" type="QString"/>
-                <Option value="0,0" name="offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="offset_unit" type="QString"/>
-                <Option value="0,0,0,255" name="outline_color" type="QString"/>
-                <Option value="solid" name="outline_style" type="QString"/>
-                <Option value="0" name="outline_width" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                <Option value="MM" name="outline_width_unit" type="QString"/>
-                <Option value="diameter" name="scale_method" type="QString"/>
-                <Option value="0.1" name="size" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                <Option value="MM" name="size_unit" type="QString"/>
-                <Option value="1" name="vertical_anchor_point" type="QString"/>
+                <Option name="angle" value="0" type="QString"/>
+                <Option name="cap_style" value="square" type="QString"/>
+                <Option name="color" value="0,0,0,255" type="QString"/>
+                <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                <Option name="joinstyle" value="bevel" type="QString"/>
+                <Option name="name" value="circle" type="QString"/>
+                <Option name="offset" value="0,0" type="QString"/>
+                <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="offset_unit" value="MM" type="QString"/>
+                <Option name="outline_color" value="0,0,0,255" type="QString"/>
+                <Option name="outline_style" value="solid" type="QString"/>
+                <Option name="outline_width" value="0" type="QString"/>
+                <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="outline_width_unit" value="MM" type="QString"/>
+                <Option name="scale_method" value="diameter" type="QString"/>
+                <Option name="size" value="0.1" type="QString"/>
+                <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                <Option name="size_unit" value="MM" type="QString"/>
+                <Option name="vertical_anchor_point" value="1" type="QString"/>
               </Option>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -11567,825 +11568,825 @@ def my_form_open(dialog, layer, feature):
         </symbols>
       </renderer-v2>
       <labeling type="rule-based">
-        <rules key="{2cd5bd60-2418-42c7-89dd-9f389593e547}">
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+        <rules key="{6f58a0db-c166-42ee-980e-2dea553699f9}">
+          <rule description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e14f9224-01e0-4824-a165-56a21ada3031}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="6" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.10000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="2" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+          <rule active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{47102982-7716-4119-9afc-04e936456ece}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="6" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.10000000000000001" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="0" name="angle" type="QString"/>
-                        <Option value="square" name="cap_style" type="QString"/>
-                        <Option value="231,113,72,255" name="color" type="QString"/>
-                        <Option value="1" name="horizontal_anchor_point" type="QString"/>
-                        <Option value="bevel" name="joinstyle" type="QString"/>
-                        <Option value="circle" name="name" type="QString"/>
-                        <Option value="0,0" name="offset" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="offset_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="offset_unit" type="QString"/>
-                        <Option value="35,35,35,255" name="outline_color" type="QString"/>
-                        <Option value="solid" name="outline_style" type="QString"/>
-                        <Option value="0" name="outline_width" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="outline_width_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="outline_width_unit" type="QString"/>
-                        <Option value="diameter" name="scale_method" type="QString"/>
-                        <Option value="2" name="size" type="QString"/>
-                        <Option value="3x:0,0,0,0,0,0" name="size_map_unit_scale" type="QString"/>
-                        <Option value="MM" name="size_unit" type="QString"/>
-                        <Option value="1" name="vertical_anchor_point" type="QString"/>
+                        <Option name="angle" value="0" type="QString"/>
+                        <Option name="cap_style" value="square" type="QString"/>
+                        <Option name="color" value="231,113,72,255" type="QString"/>
+                        <Option name="horizontal_anchor_point" value="1" type="QString"/>
+                        <Option name="joinstyle" value="bevel" type="QString"/>
+                        <Option name="name" value="circle" type="QString"/>
+                        <Option name="offset" value="0,0" type="QString"/>
+                        <Option name="offset_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="offset_unit" value="MM" type="QString"/>
+                        <Option name="outline_color" value="35,35,35,255" type="QString"/>
+                        <Option name="outline_style" value="solid" type="QString"/>
+                        <Option name="outline_width" value="0" type="QString"/>
+                        <Option name="outline_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="outline_width_unit" value="MM" type="QString"/>
+                        <Option name="scale_method" value="diameter" type="QString"/>
+                        <Option name="size" value="2" type="QString"/>
+                        <Option name="size_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
+                        <Option name="size_unit" value="MM" type="QString"/>
+                        <Option name="vertical_anchor_point" value="1" type="QString"/>
                       </Option>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="1" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="2" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
+          <rule 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' )" key="{66cc438a-cab2-4b9b-a0b6-ee5e9f6087b3}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.5" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="6" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.5" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.5" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="8" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="UnknownGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="5" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
+          <rule 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 AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{15f72075-751f-4669-b911-602d7914905d}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.59999999999999998" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="6" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.59999999999999998" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,255" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.59999999999999998" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option type="Map">
-                        <Option value="3x:0,0,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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="8" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="5" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
+          <rule 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" key="{76b7264e-9235-4824-98a7-4a0e40535053}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="8" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="8" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="position" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.90000000000000002" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,0,255" shapeBorderWidth="0.40000000000000002" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.20000000000000001" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.90000000000000002" shapeSVGFile="" shapeOffsetY="0" shapeType="3" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="10" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="10" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="0" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&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;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>
@@ -12394,157 +12395,150 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
-            <Option 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>
@@ -12552,54 +12546,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{444d8fb8-2321-4272-9699-88b713425993}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{444d8fb8-2321-4272-9699-88b713425993}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -12607,16 +12601,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12627,8 +12621,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>
@@ -12637,8 +12631,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>
@@ -12647,8 +12641,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>
@@ -12657,8 +12651,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>
@@ -12671,63 +12665,70 @@ def my_form_open(dialog, layer, feature):
           </editWidget>
         </field>
         <field name="GROUP" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_day" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="Range">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_position" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_club" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_captain" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_captain_phone" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_race" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_first_runner" configurationFlags="None">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_last_runner" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
         <field name="csv_instructions" configurationFlags="None">
-          <editWidget type="">
+          <editWidget type="TextEdit">
             <config>
               <Option/>
             </config>
@@ -12735,20 +12736,21 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="type"/>
-        <alias name="" index="3" field="notes"/>
-        <alias name="" index="4" field="day"/>
-        <alias name="" index="5" field="GROUP"/>
-        <alias name="" index="6" field="csv_day"/>
-        <alias name="" index="7" field="csv_position"/>
-        <alias name="" index="8" field="csv_club"/>
-        <alias name="" index="9" field="csv_captain"/>
-        <alias name="" index="10" field="csv_captain_phone"/>
-        <alias name="" index="11" field="csv_race"/>
-        <alias name="" index="12" field="csv_last_runner"/>
-        <alias name="" index="13" field="csv_instructions"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="type"/>
+        <alias index="3" name="" field="notes"/>
+        <alias index="4" name="" field="day"/>
+        <alias index="5" name="" field="GROUP"/>
+        <alias index="6" name="" field="csv_day"/>
+        <alias index="7" name="" field="csv_position"/>
+        <alias index="8" name="" field="csv_club"/>
+        <alias index="9" name="" field="csv_captain"/>
+        <alias index="10" name="" field="csv_captain_phone"/>
+        <alias index="11" name="" field="csv_race"/>
+        <alias index="12" name="" field="csv_first_runner"/>
+        <alias index="13" name="" field="csv_last_runner"/>
+        <alias index="14" name="" field="csv_instructions"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -12763,40 +12765,43 @@ def my_form_open(dialog, layer, feature):
         <policy field="csv_captain" policy="Duplicate"/>
         <policy field="csv_captain_phone" policy="Duplicate"/>
         <policy field="csv_race" policy="Duplicate"/>
+        <policy field="csv_first_runner" policy="Duplicate"/>
         <policy field="csv_last_runner" policy="Duplicate"/>
         <policy field="csv_instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="notes"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="GROUP"/>
-        <default expression="" applyOnUpdate="0" field="csv_day"/>
-        <default expression="" applyOnUpdate="0" field="csv_position"/>
-        <default expression="" applyOnUpdate="0" field="csv_club"/>
-        <default expression="" applyOnUpdate="0" field="csv_captain"/>
-        <default expression="" applyOnUpdate="0" field="csv_captain_phone"/>
-        <default expression="" applyOnUpdate="0" field="csv_race"/>
-        <default expression="" applyOnUpdate="0" field="csv_last_runner"/>
-        <default expression="" applyOnUpdate="0" field="csv_instructions"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="notes"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="GROUP"/>
+        <default applyOnUpdate="0" expression="" field="csv_day"/>
+        <default applyOnUpdate="0" expression="" field="csv_position"/>
+        <default applyOnUpdate="0" expression="" field="csv_club"/>
+        <default applyOnUpdate="0" expression="" field="csv_captain"/>
+        <default applyOnUpdate="0" expression="" field="csv_captain_phone"/>
+        <default applyOnUpdate="0" expression="" field="csv_race"/>
+        <default applyOnUpdate="0" expression="" field="csv_first_runner"/>
+        <default applyOnUpdate="0" expression="" field="csv_last_runner"/>
+        <default applyOnUpdate="0" expression="" field="csv_instructions"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="notes" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="GROUP" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_club" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_captain" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_captain_phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_race" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_last_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="csv_instructions" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="notes" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="GROUP" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_position" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_club" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_captain" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_captain_phone" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_race" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_first_runner" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_last_runner" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="csv_instructions" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -12811,30 +12816,32 @@ def my_form_open(dialog, layer, feature):
         <constraint desc="" exp="" field="csv_captain"/>
         <constraint desc="" exp="" field="csv_captain_phone"/>
         <constraint desc="" exp="" field="csv_race"/>
+        <constraint desc="" exp="" field="csv_first_runner"/>
         <constraint desc="" exp="" field="csv_last_runner"/>
         <constraint desc="" exp="" field="csv_instructions"/>
       </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" sortExpression="&quot;position&quot;" sortOrder="0">
         <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="GROUP" type="field" hidden="0"/>
-          <column width="-1" name="csv_day" type="field" hidden="0"/>
-          <column width="-1" name="csv_position" 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_race" 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="day" type="field" hidden="0"/>
+          <column name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="position" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="notes" hidden="0" width="-1" type="field"/>
+          <column name="GROUP" hidden="0" width="-1" type="field"/>
+          <column name="csv_day" hidden="0" width="-1" type="field"/>
+          <column name="csv_position" hidden="0" width="-1" type="field"/>
+          <column name="csv_club" hidden="0" width="-1" type="field"/>
+          <column name="csv_captain" hidden="0" width="-1" type="field"/>
+          <column name="csv_captain_phone" hidden="0" width="-1" type="field"/>
+          <column name="csv_race" hidden="0" width="-1" type="field"/>
+          <column name="csv_last_runner" hidden="0" width="-1" type="field"/>
+          <column name="csv_instructions" hidden="0" width="-1" type="field"/>
+          <column name="csv_first_runner" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12866,6 +12873,7 @@ def my_form_open(dialog, layer, feature):
       <featformsuppress>0</featformsuppress>
       <editorlayout>generatedlayout</editorlayout>
       <editable>
+        <field name="GROUP" editable="1"/>
         <field name="csv_10_distance" editable="0"/>
         <field name="csv_21_distance" editable="0"/>
         <field name="csv_Description" editable="0"/>
@@ -12913,6 +12921,7 @@ def my_form_open(dialog, layer, feature):
         <field name="xyposition" editable="1"/>
       </editable>
       <labelOnTop>
+        <field name="GROUP" labelOnTop="0"/>
         <field name="csv_10_distance" labelOnTop="0"/>
         <field name="csv_21_distance" labelOnTop="0"/>
         <field name="csv_Description" labelOnTop="0"/>
@@ -12960,38 +12969,39 @@ def my_form_open(dialog, layer, feature):
         <field name="xyposition" labelOnTop="0"/>
       </labelOnTop>
       <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_day"/>
-        <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_race"/>
-        <field reuseLastValue="0" name="csv_races"/>
-        <field reuseLastValue="0" name="csv_surname"/>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain"/>
-        <field reuseLastValue="0" name="marshals_by_position_captain_phone"/>
-        <field reuseLastValue="0" name="marshals_by_position_club"/>
-        <field reuseLastValue="0" name="marshals_by_position_day"/>
-        <field reuseLastValue="0" name="marshals_by_position_first_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_instructions"/>
-        <field reuseLastValue="0" name="marshals_by_position_last_runner"/>
-        <field reuseLastValue="0" name="marshals_by_position_position"/>
-        <field reuseLastValue="0" name="marshals_by_position_race"/>
-        <field reuseLastValue="0" name="notes"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="type"/>
-        <field reuseLastValue="0" name="xyposition"/>
+        <field name="GROUP" reuseLastValue="0"/>
+        <field name="csv_captain" reuseLastValue="0"/>
+        <field name="csv_captain_email" reuseLastValue="0"/>
+        <field name="csv_captain_phone" reuseLastValue="0"/>
+        <field name="csv_club" reuseLastValue="0"/>
+        <field name="csv_day" reuseLastValue="0"/>
+        <field name="csv_days" reuseLastValue="0"/>
+        <field name="csv_email" reuseLastValue="0"/>
+        <field name="csv_first_runner" reuseLastValue="0"/>
+        <field name="csv_firstname" reuseLastValue="0"/>
+        <field name="csv_instructions" reuseLastValue="0"/>
+        <field name="csv_last_runner" reuseLastValue="0"/>
+        <field name="csv_name" reuseLastValue="0"/>
+        <field name="csv_phone" reuseLastValue="0"/>
+        <field name="csv_position" reuseLastValue="0"/>
+        <field name="csv_race" reuseLastValue="0"/>
+        <field name="csv_races" reuseLastValue="0"/>
+        <field name="csv_surname" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain" reuseLastValue="0"/>
+        <field name="marshals_by_position_captain_phone" reuseLastValue="0"/>
+        <field name="marshals_by_position_club" reuseLastValue="0"/>
+        <field name="marshals_by_position_day" reuseLastValue="0"/>
+        <field name="marshals_by_position_first_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_instructions" reuseLastValue="0"/>
+        <field name="marshals_by_position_last_runner" reuseLastValue="0"/>
+        <field name="marshals_by_position_position" reuseLastValue="0"/>
+        <field name="marshals_by_position_race" reuseLastValue="0"/>
+        <field name="notes" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="type" reuseLastValue="0"/>
+        <field name="xyposition" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -13041,7 +13051,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" geometry="No geometry" type="vector" readOnly="0" refreshOnNotifyEnabled="0" wkbType="NoGeometry">
+    <maplayer autoRefreshEnabled="0" refreshOnNotifyEnabled="0" maxScale="100000" wkbType="NoGeometry" styleCategories="AllStyleCategories" readOnly="0" autoRefreshTime="0" geometry="No geometry" refreshOnNotifyMessage="" hasScaleBasedVisibilityFlag="0" legendPlaceholderImage="" type="vector" minScale="1e+08">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -13095,7 +13105,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13120,138 +13130,138 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -13260,18 +13270,18 @@ 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 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="first_name" 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>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13289,8 +13299,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>
@@ -13313,8 +13323,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>
@@ -13337,8 +13347,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>
@@ -13380,19 +13390,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="day"/>
-        <alias name="" index="1" field="position"/>
-        <alias name="" index="2" field="first_name"/>
-        <alias name="" index="3" field="surname"/>
-        <alias name="" index="4" field="club"/>
-        <alias name="" index="5" field="phone"/>
-        <alias name="" index="6" field="email"/>
-        <alias name="" index="7" field="captain"/>
-        <alias name="" index="8" field="captain_phone"/>
-        <alias name="" index="9" field="race"/>
-        <alias name="" index="10" field="first_runner"/>
-        <alias name="" index="11" field="last_runner"/>
-        <alias name="" index="12" field="instructions"/>
+        <alias index="0" name="" field="day"/>
+        <alias index="1" name="" field="position"/>
+        <alias index="2" name="" field="first_name"/>
+        <alias index="3" name="" field="surname"/>
+        <alias index="4" name="" field="club"/>
+        <alias index="5" name="" field="phone"/>
+        <alias index="6" name="" field="email"/>
+        <alias index="7" name="" field="captain"/>
+        <alias index="8" name="" field="captain_phone"/>
+        <alias index="9" name="" field="race"/>
+        <alias index="10" name="" field="first_runner"/>
+        <alias index="11" name="" field="last_runner"/>
+        <alias index="12" name="" field="instructions"/>
       </aliases>
       <splitPolicies>
         <policy field="day" policy="Duplicate"/>
@@ -13410,34 +13420,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="position"/>
-        <default expression="" applyOnUpdate="0" field="first_name"/>
-        <default expression="" applyOnUpdate="0" field="surname"/>
-        <default expression="" applyOnUpdate="0" field="club"/>
-        <default expression="" applyOnUpdate="0" field="phone"/>
-        <default expression="" applyOnUpdate="0" field="email"/>
-        <default expression="" applyOnUpdate="0" field="captain"/>
-        <default expression="" applyOnUpdate="0" field="captain_phone"/>
-        <default expression="" applyOnUpdate="0" field="race"/>
-        <default expression="" applyOnUpdate="0" field="first_runner"/>
-        <default expression="" applyOnUpdate="0" field="last_runner"/>
-        <default expression="" applyOnUpdate="0" field="instructions"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="position"/>
+        <default applyOnUpdate="0" expression="" field="first_name"/>
+        <default applyOnUpdate="0" expression="" field="surname"/>
+        <default applyOnUpdate="0" expression="" field="club"/>
+        <default applyOnUpdate="0" expression="" field="phone"/>
+        <default applyOnUpdate="0" expression="" field="email"/>
+        <default applyOnUpdate="0" expression="" field="captain"/>
+        <default applyOnUpdate="0" expression="" field="captain_phone"/>
+        <default applyOnUpdate="0" expression="" field="race"/>
+        <default applyOnUpdate="0" expression="" field="first_runner"/>
+        <default applyOnUpdate="0" expression="" field="last_runner"/>
+        <default applyOnUpdate="0" expression="" field="instructions"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="first_name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="surname" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="club" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="email" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="captain" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="captain_phone" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="race" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="first_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="last_runner" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="instructions" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="surname" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="club" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="phone" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="email" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="captain" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="captain_phone" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="race" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_runner" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="last_runner" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="instructions" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="day"/>
@@ -13456,24 +13466,24 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <columns>
-          <column width="-1" name="position" 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" 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="surname" type="field" hidden="0"/>
-          <column width="-1" name="day" type="field" hidden="0"/>
-          <column width="-1" name="first_name" type="field" hidden="0"/>
-          <column width="-1" name="race" type="field" hidden="0"/>
-          <column width="-1" name="captain_phone" type="field" hidden="0"/>
+          <column name="position" hidden="0" width="-1" type="field"/>
+          <column name="club" hidden="0" width="-1" type="field"/>
+          <column name="phone" hidden="0" width="-1" type="field"/>
+          <column name="email" hidden="0" width="-1" type="field"/>
+          <column name="captain" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="first_runner" hidden="0" width="-1" type="field"/>
+          <column name="last_runner" hidden="0" width="-1" type="field"/>
+          <column name="instructions" hidden="0" width="-1" type="field"/>
+          <column name="surname" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="first_name" hidden="0" width="-1" type="field"/>
+          <column name="race" hidden="0" width="-1" type="field"/>
+          <column name="captain_phone" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13553,28 +13563,28 @@ def my_form_open(dialog, layer, feature):
         <field name="tshirt" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="captain"/>
-        <field reuseLastValue="0" name="captain_email"/>
-        <field reuseLastValue="0" name="captain_phone"/>
-        <field reuseLastValue="0" name="club"/>
-        <field reuseLastValue="0" name="days"/>
-        <field reuseLastValue="0" name="email"/>
-        <field reuseLastValue="0" name="first_runner"/>
-        <field reuseLastValue="0" name="firstname"/>
-        <field reuseLastValue="0" name="instructions"/>
-        <field reuseLastValue="0" name="last_runner"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="phone"/>
-        <field reuseLastValue="0" name="position"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="surname"/>
+        <field name="captain" reuseLastValue="0"/>
+        <field name="captain_email" reuseLastValue="0"/>
+        <field name="captain_phone" reuseLastValue="0"/>
+        <field name="club" reuseLastValue="0"/>
+        <field name="days" reuseLastValue="0"/>
+        <field name="email" reuseLastValue="0"/>
+        <field name="first_runner" reuseLastValue="0"/>
+        <field name="firstname" reuseLastValue="0"/>
+        <field name="instructions" reuseLastValue="0"/>
+        <field name="last_runner" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="phone" reuseLastValue="0"/>
+        <field name="position" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="surname" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>first_name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13640,7 +13650,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13665,326 +13675,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
-          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
+          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
+          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{743d2826-031c-45d5-809e-09f032abdd16}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{743d2826-031c-45d5-809e-09f032abdd16}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" 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 enabled="1" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@1@1@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{03389801-e1b4-43c1-bed5-409ab2a31647}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -13997,11 +14007,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>
@@ -14009,54 +14019,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14064,16 +14074,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14096,20 +14106,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -14117,13 +14127,13 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14168,7 +14178,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14234,7 +14244,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14259,279 +14269,279 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="name" fontItalic="0" fontSize="8.5" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.75" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="8.5" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.75" fieldName="name" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1.5" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="1" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.20000000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="1" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="2" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="UnknownGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="0.20000000000000001" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&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;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>
@@ -14539,54 +14549,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -14594,16 +14604,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14614,8 +14624,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>
@@ -14624,8 +14634,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>
@@ -14634,8 +14644,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>
@@ -14644,8 +14654,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>
@@ -14654,8 +14664,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>
@@ -14664,8 +14674,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>
@@ -14674,8 +14684,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>
@@ -14684,8 +14694,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>
@@ -14694,23 +14704,23 @@ 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>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="osm_id"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="type"/>
-        <alias name="" index="4" field="z_order"/>
-        <alias name="" index="5" field="population"/>
-        <alias name="" index="6" field="label_x"/>
-        <alias name="" index="7" field="label_y"/>
-        <alias name="" index="8" field="label_rota"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="osm_id"/>
+        <alias index="2" name="" field="name"/>
+        <alias index="3" name="" field="type"/>
+        <alias index="4" name="" field="z_order"/>
+        <alias index="5" name="" field="population"/>
+        <alias index="6" name="" field="label_x"/>
+        <alias index="7" name="" field="label_y"/>
+        <alias index="8" name="" field="label_rota"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -14724,26 +14734,26 @@ def my_form_open(dialog, layer, feature):
         <policy field="label_rota" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="osm_id"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="z_order"/>
-        <default expression="" applyOnUpdate="0" field="population"/>
-        <default expression="" applyOnUpdate="0" field="label_x"/>
-        <default expression="" applyOnUpdate="0" field="label_y"/>
-        <default expression="" applyOnUpdate="0" field="label_rota"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="population"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="population" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="osm_id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="z_order" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="population" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_x" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_y" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_rota" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -14758,20 +14768,20 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="osm_id" hidden="0" width="-1" type="field"/>
+          <column name="name" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column name="z_order" hidden="0" width="-1" type="field"/>
+          <column name="population" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="label_x" hidden="0" width="-1" type="field"/>
+          <column name="label_y" hidden="0" width="-1" type="field"/>
+          <column name="label_rota" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14830,7 +14840,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="0">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14896,7 +14906,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14921,319 +14931,319 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{354d4d11-8126-426c-b325-0776a64e32e3}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontItalic="0" fontSize="7" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.80000000000000004" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="7" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="0.80000000000000004" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MapUnit" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="3" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="3" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="5" obstacle="1" mergeLines="1" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.29999999999999999" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="0" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="3" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MapUnit" offsetUnits="MapUnit" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="4" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="3" layerType="LineGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="0.29999999999999999" minFeatureSize="5" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="1" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&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;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>
-          <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>
@@ -15241,54 +15251,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -15296,16 +15306,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -15316,8 +15326,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>
@@ -15326,8 +15336,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>
@@ -15371,8 +15381,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>
@@ -15435,22 +15445,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="osm_id"/>
-        <alias name="" index="1" field="name"/>
-        <alias name="" index="2" field="highway"/>
-        <alias name="" index="3" field="waterway"/>
-        <alias name="" index="4" field="aerialway"/>
-        <alias name="" index="5" field="barrier"/>
-        <alias name="" index="6" field="man_made"/>
-        <alias name="" index="7" field="z_order"/>
-        <alias name="" index="8" field="other_tags"/>
-        <alias name="" index="9" field="never_show"/>
-        <alias name="" index="10" field="label_x"/>
-        <alias name="" index="11" field="label_y"/>
-        <alias name="" index="12" field="label_rota"/>
-        <alias name="" index="13" field="always_sho"/>
-        <alias name="" index="14" field="resident_a"/>
-        <alias name="" index="15" field="auxiliary_storage_labeling_show"/>
+        <alias index="0" name="" field="osm_id"/>
+        <alias index="1" name="" field="name"/>
+        <alias index="2" name="" field="highway"/>
+        <alias index="3" name="" field="waterway"/>
+        <alias index="4" name="" field="aerialway"/>
+        <alias index="5" name="" field="barrier"/>
+        <alias index="6" name="" field="man_made"/>
+        <alias index="7" name="" field="z_order"/>
+        <alias index="8" name="" field="other_tags"/>
+        <alias index="9" name="" field="never_show"/>
+        <alias index="10" name="" field="label_x"/>
+        <alias index="11" name="" field="label_y"/>
+        <alias index="12" name="" field="label_rota"/>
+        <alias index="13" name="" field="always_sho"/>
+        <alias index="14" name="" field="resident_a"/>
+        <alias index="15" name="" field="auxiliary_storage_labeling_show"/>
       </aliases>
       <splitPolicies>
         <policy field="osm_id" policy="Duplicate"/>
@@ -15471,40 +15481,40 @@ def my_form_open(dialog, layer, feature):
         <policy field="auxiliary_storage_labeling_show" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="osm_id"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="highway"/>
-        <default expression="" applyOnUpdate="0" field="waterway"/>
-        <default expression="" applyOnUpdate="0" field="aerialway"/>
-        <default expression="" applyOnUpdate="0" field="barrier"/>
-        <default expression="" applyOnUpdate="0" field="man_made"/>
-        <default expression="" applyOnUpdate="0" field="z_order"/>
-        <default expression="" applyOnUpdate="0" field="other_tags"/>
-        <default expression="" applyOnUpdate="0" field="never_show"/>
-        <default expression="" applyOnUpdate="0" field="label_x"/>
-        <default expression="" applyOnUpdate="0" field="label_y"/>
-        <default expression="" applyOnUpdate="0" field="label_rota"/>
-        <default expression="" applyOnUpdate="0" field="always_sho"/>
-        <default expression="" applyOnUpdate="0" field="resident_a"/>
-        <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_show"/>
+        <default applyOnUpdate="0" expression="" field="osm_id"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="highway"/>
+        <default applyOnUpdate="0" expression="" field="waterway"/>
+        <default applyOnUpdate="0" expression="" field="aerialway"/>
+        <default applyOnUpdate="0" expression="" field="barrier"/>
+        <default applyOnUpdate="0" expression="" field="man_made"/>
+        <default applyOnUpdate="0" expression="" field="z_order"/>
+        <default applyOnUpdate="0" expression="" field="other_tags"/>
+        <default applyOnUpdate="0" expression="" field="never_show"/>
+        <default applyOnUpdate="0" expression="" field="label_x"/>
+        <default applyOnUpdate="0" expression="" field="label_y"/>
+        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default applyOnUpdate="0" expression="" field="always_sho"/>
+        <default applyOnUpdate="0" expression="" field="resident_a"/>
+        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="highway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="waterway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="aerialway" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="barrier" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="man_made" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="other_tags" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="never_show" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="always_sho" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="resident_a" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="osm_id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="highway" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="waterway" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="aerialway" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="barrier" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="man_made" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="z_order" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="other_tags" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="never_show" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_x" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_y" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_rota" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="always_sho" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="resident_a" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_show" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="osm_id"/>
@@ -15526,27 +15536,27 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
         <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="175" 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 name="osm_id" hidden="0" width="-1" type="field"/>
+          <column name="name" hidden="0" width="160" type="field"/>
+          <column name="z_order" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="highway" hidden="0" width="-1" type="field"/>
+          <column name="waterway" hidden="0" width="-1" type="field"/>
+          <column name="aerialway" hidden="0" width="-1" type="field"/>
+          <column name="barrier" hidden="0" width="-1" type="field"/>
+          <column name="man_made" hidden="0" width="-1" type="field"/>
+          <column name="other_tags" hidden="0" width="175" type="field"/>
+          <column name="never_show" hidden="0" width="-1" type="field"/>
+          <column name="label_x" hidden="0" width="-1" type="field"/>
+          <column name="label_y" hidden="0" width="-1" type="field"/>
+          <column name="label_rota" hidden="0" width="-1" type="field"/>
+          <column name="always_sho" hidden="0" width="-1" type="field"/>
+          <column name="resident_a" hidden="0" width="-1" type="field"/>
+          <column name="auxiliary_storage_labeling_show" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15650,22 +15660,22 @@ def my_form_open(dialog, layer, feature):
         <field name="z_order" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="aerialway"/>
-        <field reuseLastValue="0" name="always_sho"/>
-        <field reuseLastValue="0" name="auxiliary_storage_labeling_show"/>
-        <field reuseLastValue="0" name="barrier"/>
-        <field reuseLastValue="0" name="highway"/>
-        <field reuseLastValue="0" name="label_rota"/>
-        <field reuseLastValue="0" name="label_x"/>
-        <field reuseLastValue="0" name="label_y"/>
-        <field reuseLastValue="0" name="man_made"/>
-        <field reuseLastValue="0" name="name"/>
-        <field reuseLastValue="0" name="never_show"/>
-        <field reuseLastValue="0" name="osm_id"/>
-        <field reuseLastValue="0" name="other_tags"/>
-        <field reuseLastValue="0" name="resident_a"/>
-        <field reuseLastValue="0" name="waterway"/>
-        <field reuseLastValue="0" name="z_order"/>
+        <field name="aerialway" reuseLastValue="0"/>
+        <field name="always_sho" reuseLastValue="0"/>
+        <field name="auxiliary_storage_labeling_show" reuseLastValue="0"/>
+        <field name="barrier" reuseLastValue="0"/>
+        <field name="highway" reuseLastValue="0"/>
+        <field name="label_rota" reuseLastValue="0"/>
+        <field name="label_x" reuseLastValue="0"/>
+        <field name="label_y" reuseLastValue="0"/>
+        <field name="man_made" reuseLastValue="0"/>
+        <field name="name" reuseLastValue="0"/>
+        <field name="never_show" reuseLastValue="0"/>
+        <field name="osm_id" reuseLastValue="0"/>
+        <field name="other_tags" reuseLastValue="0"/>
+        <field name="resident_a" reuseLastValue="0"/>
+        <field name="waterway" reuseLastValue="0"/>
+        <field name="z_order" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets>
@@ -15715,7 +15725,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15781,7 +15791,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15806,511 +15816,511 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <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"/>
+          <rule symbol="0" filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule symbol="1" filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule symbol="2" filter="&quot;type&quot; = 'togbag'" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule symbol="3" filter=" &quot;type&quot; = 'closure'" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule symbol="4" filter="&quot;type&quot; = 'myciti'" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule symbol="5" filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" locked="0" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="2" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" locked="0" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="3" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" locked="0" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="4" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" locked="0" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
               <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>
               <effect enabled="0" type="effectStack">
                 <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>
                 </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>
                 </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>
                 </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>
                 </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>
                 </effect>
               </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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="5" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{810b6ab6-d667-41dd-991f-1013e4243a85}" locked="0" pass="0" class="SvgMarker">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
               <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>
               <data_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>
@@ -16319,128 +16329,128 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="name" fontItalic="0" fontSize="10" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="name" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="2" shapeType="0" shapeRadiiY="2" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.69999999999999996" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="2" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferNoFill="0" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="2" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="1" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="2" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.69999999999999996" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="3" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="3"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="10" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="2" rotationUnit="AngleDegrees" yOffset="3" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="3" xOffset="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" layerType="UnknownGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="10" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1.8" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&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;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>
@@ -16448,54 +16458,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -16503,16 +16513,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16549,10 +16559,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="name"/>
-        <alias name="" index="3" field="distance"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="name"/>
+        <alias index="3" name="" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -16561,16 +16571,16 @@ def my_form_open(dialog, layer, feature):
         <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="name"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="name"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -16580,15 +16590,15 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="name" hidden="0" width="-1" type="field"/>
+          <column name="distance" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16637,7 +16647,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiPolygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -16711,246 +16721,246 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{638d4661-4af7-4b67-a441-09cca39661c7}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{73145fbe-931c-4579-aa0e-58592a465db8}" locked="0" pass="0" class="LinePatternFill">
+            <layer class="LinePatternFill" locked="0" enabled="1" pass="0" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@0@0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" locked="0" pass="0" class="SimpleLine">
+                <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
                   <Option type="Map">
-                    <Option value="0" name="align_dash_pattern" type="QString"/>
-                    <Option value="square" name="capstyle" type="QString"/>
-                    <Option value="5;2" name="customdash" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="customdash_unit" type="QString"/>
-                    <Option value="0" name="dash_pattern_offset" type="QString"/>
-                    <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                    <Option value="MM" name="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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -16961,11 +16971,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>
@@ -16973,54 +16983,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17028,16 +17038,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
+      <DiagramLayerSettings priority="0" dist="0" placement="1" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17053,29 +17063,29 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="FID"/>
+        <alias index="0" name="" field="FID"/>
       </aliases>
       <splitPolicies>
         <policy field="FID" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="FID"/>
+        <default applyOnUpdate="0" expression="" field="FID"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="FID" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="FID" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="FID"/>
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="431" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17120,7 +17130,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -17186,7 +17196,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17211,612 +17221,612 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" symbol="0"/>
-          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" symbol="1"/>
-          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" symbol="2"/>
-          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" symbol="3"/>
-          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" symbol="4"/>
+          <rule symbol="0" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open"/>
+          <rule symbol="1" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking"/>
+          <rule symbol="2" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed"/>
+          <rule symbol="3" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way"/>
+          <rule symbol="4" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{8668549c-374e-4077-bc7c-96a9bac646a8}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="2" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
               <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>
               <data_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 enabled="1" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@2@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{e7a97d22-eba0-4c48-9578-db859faf4112}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="3" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{07696f80-e7db-403b-b380-82695a86ae34}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{07696f80-e7db-403b-b380-82695a86ae34}">
               <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>
               <data_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 enabled="1" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
               <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>
               <data_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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@3@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{e24fa060-35e4-4c51-b944-426558636610}" locked="0" pass="0" class="SimpleMarker">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{e24fa060-35e4-4c51-b944-426558636610}">
                   <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>
                   <data_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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="4" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_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>
@@ -17825,96 +17835,96 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="times" fontItalic="0" fontSize="9" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="9" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Regular" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="1" fieldName="times" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="4294967295" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="5" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="2" layerType="UnknownGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&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;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>
@@ -17922,54 +17932,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{27379576-e711-4788-850d-75df56ba927b}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{27379576-e711-4788-850d-75df56ba927b}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -17977,16 +17987,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18023,10 +18033,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
-        <alias name="" index="2" field="status"/>
-        <alias name="" index="3" field="times"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
+        <alias index="2" name="" field="status"/>
+        <alias index="3" name="" field="times"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -18035,16 +18045,16 @@ def my_form_open(dialog, layer, feature):
         <policy field="times" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
-        <default expression="" applyOnUpdate="0" field="status"/>
-        <default expression="" applyOnUpdate="0" field="times"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
+        <default applyOnUpdate="0" expression="" field="status"/>
+        <default applyOnUpdate="0" expression="" field="times"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="status" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="times" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="status" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="times" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -18054,15 +18064,15 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="type" hidden="0" width="202" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="status" hidden="0" width="-1" type="field"/>
+          <column name="times" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18111,7 +18121,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="100000" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.37579747691996346</xmin>
         <ymin>-33.95582399193413892</ymin>
@@ -18185,1020 +18195,1020 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{93207e61-042d-4541-8790-df2a776e7483}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{93207e61-042d-4541-8790-df2a776e7483}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" description="Active routes">
+          <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_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; ILIKE '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; ILIKE '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; ILIKE '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; ILIKE '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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="3" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" description="Show by day">
+          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="0,0,0,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="0,0,0,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_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; ILIKE '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; ILIKE '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; ILIKE '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; ILIKE '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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="3" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="minLength" value="0" type="double"/>
+                  <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="minLengthUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromAnchor" value="0" type="double"/>
+                  <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                  <Option name="offsetFromLabel" value="0" type="double"/>
+                  <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                  <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                 </Option>
               </callout>
             </settings>
           </rule>
-          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" active="0" description="List for legends">
-            <rule filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" active="0" description="21KM">
+          <rule active="0" description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
+            <rule active="0" description="21KM" filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
               <settings calloutType="simple">
-                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+                <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="210,32,39,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="210,32,39,255" shapeOffsetX="0">
-                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                  <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                  <background shapeFillColor="210,32,39,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="128" shapeBorderColor="210,32,39,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                    <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                         <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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                  <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                   <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="3" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="UnknownGeometry"/>
+                <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
                 <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" active="0" description="10KM">
+            <rule active="0" description="10KM" filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
               <settings calloutType="simple">
-                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+                <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="103,34,144,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="103,34,144,255" shapeOffsetX="0">
-                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                  <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                  <background shapeFillColor="103,34,144,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="128" shapeBorderColor="103,34,144,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                    <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                         <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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                  <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                   <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="UnknownGeometry"/>
+                <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
                 <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" active="0" description="5KM">
+            <rule active="0" description="5KM" filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
               <settings calloutType="simple">
-                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+                <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0">
-                    <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                  <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                  <background shapeFillColor="145,211,55,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="145,211,55,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                    <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                      <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                         <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="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="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="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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                    <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                         <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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                  <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                   <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+                <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
                 <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&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;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="minLength" value="0" type="double"/>
+                    <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="minLengthUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromAnchor" value="0" type="double"/>
+                    <Option name="offsetFromAnchorMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromAnchorUnit" value="MM" type="QString"/>
+                    <Option name="offsetFromLabel" value="0" type="double"/>
+                    <Option name="offsetFromLabelMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
+                    <Option name="offsetFromLabelUnit" value="MM" type="QString"/>
                   </Option>
                 </callout>
               </settings>
             </rule>
-            <rule filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}" active="0" description="Trail">
+            <rule active="0" description="Trail" filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
               <settings calloutType="simple">
-                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+                <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="1" fontKerning="1" textOpacity="1" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="255,255,255,255" blendMode="0" fontLetterSpacing="0">
                   <families/>
-                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0">
-                    <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="0" bufferDraw="0"/>
+                  <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                  <background shapeFillColor="145,211,55,255" shapeBorderWidth="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="145,211,55,255" shapeRadiiY="1" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                    <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                      <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                         <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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                    <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                         <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>
                         <data_defined_properties>
                           <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
+                            <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                  <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                   <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+                <text-format decimals="0" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+                <placement priority="10" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="AllowOverlapIfRequired" lineAnchorClipping="0" allowDegraded="1" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="2" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="20" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-20" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="6" layerType="PointGeometry"/>
+                <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="2000" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="2" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
                 <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&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;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>
@@ -19208,13 +19218,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>
@@ -19222,54 +19232,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="100000" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -19277,16 +19287,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19297,8 +19307,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>
@@ -19307,8 +19317,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>
@@ -19317,8 +19327,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>
@@ -19327,8 +19337,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>
@@ -19337,8 +19347,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>
@@ -19361,8 +19371,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>
@@ -19371,8 +19381,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>
@@ -19381,8 +19391,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>
@@ -19391,8 +19401,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>
@@ -19401,26 +19411,26 @@ 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>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="begin"/>
-        <alias name="" index="2" field="end"/>
-        <alias name="" index="3" field="Distance"/>
-        <alias name="" index="4" field="RouteLen"/>
-        <alias name="" index="5" field="Sort"/>
-        <alias name="" index="6" field="day"/>
-        <alias name="" index="7" field="Source"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="length_m"/>
-        <alias name="" index="10" field="org_fid"/>
-        <alias name="" index="11" field="distance"/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="begin"/>
+        <alias index="2" name="" field="end"/>
+        <alias index="3" name="" field="Distance"/>
+        <alias index="4" name="" field="RouteLen"/>
+        <alias index="5" name="" field="Sort"/>
+        <alias index="6" name="" field="day"/>
+        <alias index="7" name="" field="Source"/>
+        <alias index="8" name="" field="length_km"/>
+        <alias index="9" name="" field="length_m"/>
+        <alias index="10" name="" field="org_fid"/>
+        <alias index="11" name="" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -19437,32 +19447,32 @@ def my_form_open(dialog, layer, feature):
         <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="Name"/>
-        <default expression="" applyOnUpdate="0" field="begin"/>
-        <default expression="" applyOnUpdate="0" field="end"/>
-        <default expression="" applyOnUpdate="0" field="Distance"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="Sort"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="org_fid"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Sort"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Sort" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Sort" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="org_fid" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="Name"/>
@@ -19480,23 +19490,23 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Source&quot;" sortOrder="0">
         <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="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="Sort" type="field" hidden="0"/>
-          <column width="-1" name="day" type="field" hidden="0"/>
-          <column width="-1" name="length_m" type="field" hidden="0"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="org_fid" hidden="0" width="-1" type="field"/>
+          <column name="distance" hidden="0" width="-1" type="field"/>
+          <column name="Name" hidden="0" width="-1" type="field"/>
+          <column name="Source" hidden="0" width="-1" type="field"/>
+          <column name="RouteLen" hidden="0" width="-1" type="field"/>
+          <column name="begin" hidden="0" width="-1" type="field"/>
+          <column name="end" hidden="0" width="-1" type="field"/>
+          <column name="Distance" hidden="0" width="-1" type="field"/>
+          <column name="length_km" hidden="0" width="-1" type="field"/>
+          <column name="Sort" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="length_m" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19562,28 +19572,28 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <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="distance"/>
-        <field reuseLastValue="0" name="end"/>
-        <field reuseLastValue="0" name="length_km"/>
-        <field reuseLastValue="0" name="length_m"/>
-        <field reuseLastValue="0" name="org_fid"/>
-        <field reuseLastValue="0" name="quadrant"/>
-        <field reuseLastValue="0" name="timestamp"/>
+        <field name="Distance" reuseLastValue="0"/>
+        <field name="Name" reuseLastValue="0"/>
+        <field name="RouteLen" reuseLastValue="0"/>
+        <field name="Sort" reuseLastValue="0"/>
+        <field name="Source" reuseLastValue="0"/>
+        <field name="begin" reuseLastValue="0"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="descriptio" reuseLastValue="0"/>
+        <field name="distance" reuseLastValue="0"/>
+        <field name="end" reuseLastValue="0"/>
+        <field name="length_km" reuseLastValue="0"/>
+        <field name="length_m" reuseLastValue="0"/>
+        <field name="org_fid" reuseLastValue="0"/>
+        <field name="quadrant" reuseLastValue="0"/>
+        <field name="timestamp" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip enabled="1">Text</mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiPolygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -19657,173 +19667,173 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="singleSymbol">
         <symbols>
-          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -19834,16 +19844,16 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
-          <Option value="&quot;id&quot;" name="dualview/previewExpressions" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
+          <Option name="dualview/previewExpressions" value="&quot;id&quot;" type="QString"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -19875,9 +19885,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="area"/>
-        <alias name="" index="2" field="rotation"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="area"/>
+        <alias index="2" name="" field="rotation"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -19885,14 +19895,14 @@ def my_form_open(dialog, layer, feature):
         <policy field="rotation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="area"/>
-        <default expression="" applyOnUpdate="0" field="rotation"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="area"/>
+        <default applyOnUpdate="0" expression="" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="area" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="rotation" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="area" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="rotation" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -19901,14 +19911,14 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="area" hidden="0" width="-1" type="field"/>
+          <column name="rotation" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19931,7 +19941,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -19997,7 +20007,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -20022,195 +20032,195 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" checkstate="0" label="All distances" symbol="0"/>
+          <rule symbol="0" checkstate="0" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" label="All distances"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{929956be-fb51-4c17-886b-1ed43d282cde}" locked="1" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="1" enabled="1" pass="0" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
               <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>
               <data_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>
@@ -20222,15 +20232,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>
@@ -20238,54 +20248,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -20293,16 +20303,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -20334,8 +20344,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>
@@ -20351,8 +20361,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>
@@ -20361,8 +20371,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>
@@ -20411,19 +20421,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="Name"/>
-        <alias name="" index="1" field="descriptio"/>
-        <alias name="" index="2" field="timestamp"/>
-        <alias name="" index="3" field="begin"/>
-        <alias name="" index="4" field="end"/>
-        <alias name="" index="5" field="RouteLen"/>
-        <alias name="" index="6" field="Source"/>
-        <alias name="" index="7" field="length_m"/>
-        <alias name="" index="8" field="length_km"/>
-        <alias name="" index="9" field="org_fid"/>
-        <alias name="" index="10" field="distance"/>
-        <alias name="" index="11" field="first_runn"/>
-        <alias name="" index="12" field="last_runne"/>
+        <alias index="0" name="" field="Name"/>
+        <alias index="1" name="" field="descriptio"/>
+        <alias index="2" name="" field="timestamp"/>
+        <alias index="3" name="" field="begin"/>
+        <alias index="4" name="" field="end"/>
+        <alias index="5" name="" field="RouteLen"/>
+        <alias index="6" name="" field="Source"/>
+        <alias index="7" name="" field="length_m"/>
+        <alias index="8" name="" field="length_km"/>
+        <alias index="9" name="" field="org_fid"/>
+        <alias index="10" name="" field="distance"/>
+        <alias index="11" name="" field="first_runn"/>
+        <alias index="12" name="" field="last_runne"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -20441,34 +20451,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="last_runne" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="Name"/>
-        <default expression="" applyOnUpdate="0" field="descriptio"/>
-        <default expression="" applyOnUpdate="0" field="timestamp"/>
-        <default expression="" applyOnUpdate="0" field="begin"/>
-        <default expression="" applyOnUpdate="0" field="end"/>
-        <default expression="" applyOnUpdate="0" field="RouteLen"/>
-        <default expression="" applyOnUpdate="0" field="Source"/>
-        <default expression="" applyOnUpdate="0" field="length_m"/>
-        <default expression="" applyOnUpdate="0" field="length_km"/>
-        <default expression="" applyOnUpdate="0" field="org_fid"/>
-        <default expression="" applyOnUpdate="0" field="distance"/>
-        <default expression="" applyOnUpdate="0" field="first_runn"/>
-        <default expression="" applyOnUpdate="0" field="last_runne"/>
+        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default applyOnUpdate="0" expression="" field="descriptio"/>
+        <default applyOnUpdate="0" expression="" field="timestamp"/>
+        <default applyOnUpdate="0" expression="" field="begin"/>
+        <default applyOnUpdate="0" expression="" field="end"/>
+        <default applyOnUpdate="0" expression="" field="RouteLen"/>
+        <default applyOnUpdate="0" expression="" field="Source"/>
+        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default applyOnUpdate="0" expression="" field="length_km"/>
+        <default applyOnUpdate="0" expression="" field="org_fid"/>
+        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default applyOnUpdate="0" expression="" field="first_runn"/>
+        <default applyOnUpdate="0" expression="" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="first_runn" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="last_runne" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="descriptio" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="timestamp" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="org_fid" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_runn" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="last_runne" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="Name"/>
@@ -20487,24 +20497,24 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
         <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 name="begin" hidden="0" width="179" type="field"/>
+          <column name="RouteLen" hidden="0" width="-1" type="field"/>
+          <column name="Source" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="Name" hidden="0" width="-1" type="field"/>
+          <column name="length_m" hidden="0" width="-1" type="field"/>
+          <column name="length_km" hidden="0" width="-1" type="field"/>
+          <column name="org_fid" hidden="0" width="-1" type="field"/>
+          <column name="first_runn" hidden="0" width="-1" type="field"/>
+          <column name="last_runne" hidden="0" width="-1" type="field"/>
+          <column name="descriptio" hidden="0" width="-1" type="field"/>
+          <column name="timestamp" hidden="0" width="-1" type="field"/>
+          <column name="end" hidden="0" width="-1" type="field"/>
+          <column name="distance" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20595,7 +20605,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="0" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Line" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiLineString" simplifyDrawingHints="1">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -20669,326 +20679,326 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{963b9e9e-c03d-476c-a792-effe8028add1}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{7362ff98-e908-498b-82c9-17b74285e0f4}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{20af25c5-139a-4a43-b257-4147f560bd1e}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="RuleRenderer">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
-          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
+          <rule symbol="0" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car"/>
+          <rule symbol="1" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking"/>
         </rules>
         <symbols>
-          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="0" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="1" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" 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 enabled="1" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" locked="0" pass="0" class="MarkerLine">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" 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" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <symbol alpha="1" name="@1@1" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" locked="0" pass="0" class="FilledMarker">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
                   <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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" 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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="@@1@1@0" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="{61856921-c649-4f9a-86f1-1032eeec1eca}" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="QString"/>
                           <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
+                          <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
                     </layer>
@@ -21001,11 +21011,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>
@@ -21013,54 +21023,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21068,16 +21078,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
+      <DiagramLayerSettings priority="0" dist="0" placement="2" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21100,20 +21110,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="type"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="type"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="type"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="type"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -21121,13 +21131,13 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="type" hidden="0" width="-1" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21172,7 +21182,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Point" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="Point" simplifyDrawingHints="0">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -21246,236 +21256,236 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="label" fontItalic="0" fontSize="15" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="15" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Semibold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="1" fieldName="label" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="1"/>
+            <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+          <text-format decimals="3" autoWrapLength="0" multilineAlign="3" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+          <placement priority="5" centroidWhole="0" overrunDistanceUnit="MM" quadOffset="4" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MM" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" layerType="UnknownGeometry"/>
+          <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="0" fontMinPixelSize="3" scaleMax="0" maxNumLabels="2000" obstacle="1" scaleMin="0" scaleVisibility="0" labelPerPart="0" obstacleFactor="1" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
           <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&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;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>
@@ -21483,54 +21493,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="1"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -21538,16 +21548,16 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="18" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21570,20 +21580,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="label"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="label"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
         <policy field="label" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="label"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -21591,13 +21601,13 @@ def my_form_open(dialog, layer, feature):
       </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" sortExpression="" sortOrder="0">
         <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 name="id" hidden="0" width="-1" type="field"/>
+          <column name="label" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21642,7 +21652,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
+    <maplayer autoRefreshEnabled="0" labelsEnabled="1" refreshOnNotifyMessage="" maxScale="0" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" simplifyLocal="1" readOnly="0" refreshOnNotifyEnabled="0" simplifyMaxScale="1" simplifyAlgorithm="0" minScale="100000000" autoRefreshTime="0" type="vector" geometry="Polygon" symbologyReferenceScale="-1" simplifyDrawingTol="1" wkbType="MultiPolygon" simplifyDrawingHints="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -21708,7 +21718,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
+          <spatial minx="0" maxx="0" crs="" maxy="0" minz="0" miny="0" dimensions="2" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21733,267 +21743,267 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
+      <temporal durationUnit="min" durationField="" accumulate="0" limitMode="0" mode="0" enabled="0" endExpression="" startField="" endField="" fixedDuration="0" startExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
+      <elevation zscale="1" extrusionEnabled="0" extrusion="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" zoffset="0" clamping="Terrain" type="IndividualFeatures" 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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                <Option value="MM" name="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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" locked="0" pass="0" class="SimpleMarker">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
+      <renderer-v2 enableorderby="0" forceraster="0" symbollevels="0" referencescale="-1" type="nullSymbol"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}" description="Show water tables">
+          <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Bold" fontWeight="75" blendMode="0" fontWordSpacing="0" fieldName="label" fontItalic="0" fontSize="8" textColor="31,120,180,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
+              <text-style fontWordSpacing="0" capitalization="0" legendString="Aa" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="8" useSubstitutions="0" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="Bold" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" isExpression="0" fontKerning="1" textOpacity="0.90000000000000002" fieldName="label" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="75" textColor="31,120,180,255" blendMode="0" fontLetterSpacing="0">
                 <families/>
-                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
-                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0.5" shapeType="0" shapeRadiiY="0.5" shapeSizeY="0.29999999999999999" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.75" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,204" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeBorderColor="31,120,206,255" shapeOffsetX="0">
-                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                <text-buffer bufferBlendMode="0" bufferSize="0.75" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferNoFill="0" bufferDraw="0"/>
+                <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+                <background shapeFillColor="255,255,255,204" shapeBorderWidth="0.75" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0.5" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0.29999999999999999" shapeJoinStyle="64" shapeBorderColor="31,120,206,255" shapeRadiiY="0.5" shapeRotation="0" shapeRotationType="0" shapeOpacity="0.59999999999999998" shapeSVGFile="" shapeOffsetY="-0.14999999999999999" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                  <symbol alpha="1" name="markerSymbol" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="">
                       <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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="QString"/>
                         <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
+                        <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                       <Option 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>
                       <data_defined_properties>
                         <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
+                          <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+                <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
                 <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" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
-              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PolygonGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="1" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
-              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="6" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.76000000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
+              <text-format decimals="3" autoWrapLength="0" multilineAlign="1" leftDirectionSymbol="&lt;" rightDirectionSymbol=">" plussign="0" wrapChar="" placeDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" formatNumbers="0" addDirectionSymbol="0"/>
+              <placement priority="5" centroidWhole="1" overrunDistanceUnit="MM" quadOffset="1" rotationUnit="AngleDegrees" yOffset="0" repeatDistanceUnits="MM" offsetUnits="MapUnit" overlapHandling="PreventOverlap" lineAnchorClipping="0" allowDegraded="0" rotationAngle="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorType="PointGeometry" geometryGenerator="" repeatDistance="0" overrunDistance="0" lineAnchorTextPoint="CenterOfText" dist="0" xOffset="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" maxCurvedCharAngleIn="25" lineAnchorType="0" centroidInside="0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" distUnits="MM" lineAnchorPercent="0.5" polygonPlacementFlags="2" preserveRotation="1" maxCurvedCharAngleOut="-25" placementFlags="10" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" placement="0" layerType="PolygonGeometry"/>
+              <rendering fontLimitPixelSize="0" upsidedownLabels="0" limitNumLabels="0" zIndex="5" fontMinPixelSize="3" scaleMax="10000000" maxNumLabels="6" obstacle="1" scaleMin="1" scaleVisibility="0" labelPerPart="0" obstacleFactor="0.76000000000000001" minFeatureSize="0" unplacedVisibility="0" obstacleType="0" drawLabels="1" mergeLines="0" fontMaxPixelSize="10000"/>
               <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; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&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 enabled=&quot;1&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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;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 alpha=&quot;1&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; is_animated=&quot;0&quot; type=&quot;line&quot; force_rhr=&quot;0&quot; clip_to_extent=&quot;1&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; 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 class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&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;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>
@@ -22002,9 +22012,9 @@ def my_form_open(dialog, layer, feature):
       </labeling>
       <customproperties>
         <Option type="Map">
-          <Option value="copy" name="QFieldSync/action" type="QString"/>
-          <Option value="offline" name="QFieldSync/cloud_action" type="QString"/>
-          <Option value="{}" name="QFieldSync/photo_naming" type="QString"/>
+          <Option name="QFieldSync/action" value="copy" type="QString"/>
+          <Option name="QFieldSync/cloud_action" value="offline" type="QString"/>
+          <Option name="QFieldSync/photo_naming" value="{}" type="QString"/>
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
@@ -22012,7 +22022,7 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
+          <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="variableNames" type="invalid"/>
           <Option name="variableValues" type="invalid"/>
         </Option>
@@ -22020,54 +22030,54 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
-          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0"/>
-          <attribute colorOpacity="1" color="#000000" label="" field=""/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory labelPlacementMethod="XHeight" penAlpha="255" spacingUnit="MM" spacing="0" minScaleDenominator="0" scaleBasedVisibility="0" sizeType="MM" height="15" rotationOffset="270" diagramOrientation="Up" penColor="#000000" showAxis="0" spacingUnitScale="3x:0,0,0,0,0,0" direction="1" backgroundColor="#ffffff" opacity="1" lineSizeType="MM" backgroundAlpha="255" scaleDependency="Area" lineSizeScale="3x:0,0,0,0,0,0" enabled="0" penWidth="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minimumSize="0" maxScaleDenominator="1e+08" width="15">
+          <fontProperties style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" strikethrough="0" bold="0" italic="0"/>
+          <attribute color="#000000" colorOpacity="1" label="" field=""/>
           <axisSymbol>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -22075,22 +22085,22 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
+      <DiagramLayerSettings priority="0" dist="0" placement="0" zIndex="0" obstacle="0" linePlacementFlags="2" showAll="1">
         <properties>
           <Option type="Map">
-            <Option value="" name="name" type="QString"/>
+            <Option name="name" value="" type="QString"/>
             <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
+            <Option name="type" value="collection" type="QString"/>
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
-            <Option value="0" name="allowedGapsBuffer" type="double"/>
-            <Option value="false" name="allowedGapsEnabled" type="bool"/>
-            <Option value="" name="allowedGapsLayer" type="QString"/>
+            <Option name="allowedGapsBuffer" value="0" type="double"/>
+            <Option name="allowedGapsEnabled" value="false" type="bool"/>
+            <Option name="allowedGapsLayer" value="" type="QString"/>
           </Option>
         </checkConfiguration>
       </geometryOptions>
@@ -22101,8 +22111,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>
@@ -22111,8 +22121,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>
@@ -22121,8 +22131,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>
@@ -22143,11 +22153,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias name="" index="0" field="id"/>
-        <alias name="" index="1" field="table_set"/>
-        <alias name="" index="2" field="label"/>
-        <alias name="" index="3" field="races"/>
-        <alias name="" index="4" field="day"/>
+        <alias index="0" name="" field="id"/>
+        <alias index="1" name="" field="table_set"/>
+        <alias index="2" name="" field="label"/>
+        <alias index="3" name="" field="races"/>
+        <alias index="4" name="" field="day"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -22157,18 +22167,18 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default expression="" applyOnUpdate="0" field="id"/>
-        <default expression="" applyOnUpdate="0" field="table_set"/>
-        <default expression="" applyOnUpdate="0" field="label"/>
-        <default expression="" applyOnUpdate="0" field="races"/>
-        <default expression="" applyOnUpdate="0" field="day"/>
+        <default applyOnUpdate="0" expression="" field="id"/>
+        <default applyOnUpdate="0" expression="" field="table_set"/>
+        <default applyOnUpdate="0" expression="" field="label"/>
+        <default applyOnUpdate="0" expression="" field="races"/>
+        <default applyOnUpdate="0" expression="" field="day"/>
       </defaults>
       <constraints>
-        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="table_set" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="races" exp_strength="0" unique_strength="0"/>
-        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="table_set" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="races" unique_strength="0"/>
+        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
         <constraint desc="" exp="" field="id"/>
@@ -22179,16 +22189,16 @@ def my_form_open(dialog, layer, feature):
       </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;">
+      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
         <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="-1" name="day" type="field" hidden="0"/>
-          <column width="130" name="races" type="field" hidden="0"/>
+          <column name="id" hidden="0" width="-1" type="field"/>
+          <column hidden="1" width="-1" type="actions"/>
+          <column name="table_set" hidden="0" width="-1" type="field"/>
+          <column name="label" hidden="0" width="-1" type="field"/>
+          <column name="day" hidden="0" width="-1" type="field"/>
+          <column name="races" hidden="0" width="130" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22234,11 +22244,11 @@ def my_form_open(dialog, layer, feature):
         <field name="table_set" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field reuseLastValue="0" name="day"/>
-        <field reuseLastValue="0" name="id"/>
-        <field reuseLastValue="0" name="label"/>
-        <field reuseLastValue="0" name="races"/>
-        <field reuseLastValue="0" name="table_set"/>
+        <field name="day" reuseLastValue="0"/>
+        <field name="id" reuseLastValue="0"/>
+        <field name="label" reuseLastValue="0"/>
+        <field name="races" reuseLastValue="0"/>
+        <field name="table_set" reuseLastValue="0"/>
       </reuseLastValue>
       <dataDefinedFieldProperties/>
       <widgets/>
@@ -22442,7 +22452,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230911 - Gun Run 2023 - Marshal Plan 1.8.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230914 - Gun Run 2023 - Marshal Plan 1.9.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -22611,320 +22621,320 @@ 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="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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <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="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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1"/>
       <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 style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1"/>
       <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="1">
-      <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="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+    <visibility-preset name="Fencing" has-expanded-info="1" has-checked-group-info="1">
+      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="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="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer style="default" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
         <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer 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="water_tables20170921142016467" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{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>
       <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
+    <visibility-preset name="Marshal map - inset" has-expanded-info="1" has-checked-group-info="1">
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="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" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
       <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="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+      <checked-group-nodes>
+        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Marshal map - main" has-expanded-info="1" has-checked-group-info="1">
+      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="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="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
       <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="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="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="Marshals"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal plan" has-checked-group-info="1" has-expanded-info="1">
-      <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="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+    <visibility-preset name="Marshal plan" has-expanded-info="1" has-checked-group-info="1">
+      <layer style="default" expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-      </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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="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="water_tables20170921142016467" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
       <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Marshals"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
         <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="1">
-      <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="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <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="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-      </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="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset name="Routes" has-expanded-info="1" has-checked-group-info="1">
+      <layer style="default" expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="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="water_tables20170921142016467" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
       <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Map"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <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="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"/>
+      <layer style="default" expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <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="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1"/>
       <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <layer style="default" expanded="1" id="water_tables20170921142016467" visible="1"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="Fencing" expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Routes/Markers"/>
-        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Start and Finish pages"/>
       </expanded-group-nodes>
     </visibility-preset>
   </visibility-presets>
@@ -22954,83 +22964,83 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Marshals" worldFileMap="" printResolution="120" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" groupUuid="" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23038,15 +23048,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="158.226,6.0007,mm" visibility="1" position="158.226,6.0007,mm" itemRotation="0" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" id="" size="132.391,187.018,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="6" sectionWidth="132.391" frame="false" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionY="0" background="false" excludeFromExports="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionHeight="187.018">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" position="158.226,6.0007,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" groupUuid="" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="132.391" size="132.391,187.018,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="184.2" blendMode="0" sectionY="0" positionOnPage="158.226,6.0007,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="6">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23054,15 +23064,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="128.508,3.98741,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="bevel" positionOnPage="128.508,3.98741,mm" minSymbolSize="0" itemRotation="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.1,mm" title="" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="20.4703,32.2333,mm" id="" symbolHeight="4" zValue="5">
-        <FrameColor blue="128" red="128" green="128" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="5" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="true" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" frameJoinStyle="bevel" legendFilterByAtlas="0" equalColumnWidth="1" titleAlignment="1" resizeToContents="1" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="128.508,3.98741,mm" rasterBorderColor="0,0,0,255" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="128.508,3.98741,mm" size="20.4703,32.2333,mm" outlineWidthM="0.1,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="128" green="128" red="128"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23073,242 +23083,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.8805579999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="11" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.8805579999999997" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="1">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.1750019999999992" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="1" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="9" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.1750019999999992" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="8" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="3.8222239999999998" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="8" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="3.8222239999999998" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -23318,17 +23328,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -23336,166 +23346,166 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.2,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="98.7828,149.027,mm" visibility="1" followPreset="true" position="98.7828,149.027,mm" itemRotation="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" id="Inset map" size="56.5192,54.5647,mm" frameJoinStyle="miter" blendMode="0" zValue="3" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal map - inset" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="98.7828,149.027,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" groupUuid="" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Marshal map - inset" id="Inset map" labelMargin="0,mm" size="56.5192,54.5647,mm" outlineWidthM="0.2,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="98.7828,149.027,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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.41126562861851212" xmin="18.40697388772057153" ymax="-33.9017837760004852" ymin="-33.90592710104210994"/>
+        <Extent ymin="-33.90592710104210994" ymax="-33.9017837760004852" xmax="18.41126562861851212" xmin="18.40697388772057153"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -23503,34 +23513,34 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" name="Overview 1" show="1" blendMode="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" inverted="0">
-          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <ComposerMapOverview centered="1" name="Overview 1" show="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" position="3" inverted="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23538,9 +23548,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>
@@ -23548,173 +23558,173 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="3.53,6.0007,mm" visibility="1" followPreset="true" position="3.53,6.0007,mm" itemRotation="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" id="Main map" size="142,187.018,mm" frameJoinStyle="miter" blendMode="0" zValue="2" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal map - main" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="3.53,6.0007,mm" mapFlags="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" groupUuid="" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Marshal map - main" id="Main map" labelMargin="0,mm" size="142,187.018,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="3.53,6.0007,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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.40963321822056642" xmin="18.40860629811851723" ymax="-33.90317919753172049" ymin="-33.90453167951087465"/>
+        <Extent ymin="-33.90453167951087465" ymax="-33.90317919753172049" xmax="18.40963321822056642" xmin="18.40860629811851723"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -23722,28 +23732,28 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="1" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="246.665,178.41,mm" visibility="1" mode="1" position="246.665,178.41,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northMode="0" id="" size="47.1065,27.6,mm" pictureRotation="0" pictureHeight="26.6623" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="0" blendMode="0" zValue="1" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_500.png" pictureWidth="47.1065" excludeFromExports="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="246.665,178.41,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" groupUuid="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" opacity="1" pictureWidth="47.1065" northOffset="0" anchorPoint="0" visibility="1" id="" size="47.1065,27.6,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../GunRun2023_500.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="246.665,178.41,mm" excludeFromExports="0" pictureHeight="26.6623" positionLock="true" referencePoint="0" zValue="1" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -23751,14 +23761,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame url="" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#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|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&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;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" resizeMode="0" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
+      <LayoutMultiFrame maxBreakDistance="10" 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;}" resizeMode="0" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Day&lt;/td>&lt;td>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;[%if ( &quot;csv_race&quot;, '&lt;tr>&lt;td>Races&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_race&quot;, &quot;csv_race&quot;, '')%]&#xa;[%if ( &quot;csv_race&quot;, '&lt;/td>&lt;/tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&#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|Tim)' ), '', '&lt;tr>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&lt;/td>&lt;td>')  %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', &quot;csv_captain_phone&quot;) %]&#xa;[% if ( regexp_match( &quot;csv_captain&quot;, '^(Roger|Tim)' ), '', '&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;tr>&lt;td>Roger Steward&lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please  your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephan Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>&#xa;" useSmartBreaks="true" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}">
         <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -23768,112 +23778,112 @@ 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="int"/>
-          <Option value="true" name="imageAntialias" type="bool"/>
-          <Option value="0" name="imageCropMarginBottom" type="int"/>
-          <Option value="0" name="imageCropMarginLeft" type="int"/>
-          <Option value="0" name="imageCropMarginRight" type="int"/>
-          <Option value="0" name="imageCropMarginTop" type="int"/>
-          <Option value="0" name="imageCropMarginUnit" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="bool"/>
-          <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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" 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="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="bool"/>
+          <Option name="atlasRasterFormat" value="jpg" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="bool"/>
+          <Option name="imageCropMarginBottom" value="0" type="int"/>
+          <Option name="imageCropMarginLeft" value="0" type="int"/>
+          <Option name="imageCropMarginRight" value="0" type="int"/>
+          <Option name="imageCropMarginTop" value="0" type="int"/>
+          <Option name="imageCropMarginUnit" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="bool"/>
+          <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~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~route_markers_21122a5c_9be9_458c_9d62_573685055e1c" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="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="bool"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" enabled="1" coverageLayerName="marshal_positions" hideCoverage="0" sortKey="&quot;position&quot;" pageNameExpression="&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="marshal_positions" coverageLayerProvider="ogr" pageNameExpression="&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" hideCoverage="0" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" sortKey="&quot;position&quot;" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Start &amp; Finish Backgrounds" worldFileMap="" printResolution="300" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" groupUuid="" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -23881,21 +23891,21 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="286.027,2,mm" visibility="1" mode="0" position="286.027,2,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northMode="0" id="" size="9.45865,11,mm" pictureRotation="330" pictureHeight="7.97477" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="0" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767" excludeFromExports="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="286.027,2,mm" pictureRotation="330" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" groupUuid="" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" opacity="1" pictureWidth="6.31767" northOffset="0" anchorPoint="0" visibility="1" id="" size="9.45865,11,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="arrows/NorthArrow_11.svg" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="0" positionOnPage="286.027,2,mm" excludeFromExports="0" pictureHeight="7.97477" positionLock="true" referencePoint="0" zValue="4" resizeMode="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -23903,476 +23913,476 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="285.027,205.886,mm" marginX="1" visibility="1" position="285.027,205.886,mm" itemRotation="270" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" id="" size="142.543,10.3185,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="3" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="[%upper( &quot;area&quot; )%]" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="285.027,205.886,mm" background="false" itemRotation="270" frame="false" frameJoinStyle="miter" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" groupUuid="" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="[%upper( &quot;area&quot; )%]" size="142.543,10.3185,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="285.027,205.886,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 type="65646" outlineWidth="0.3" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="7,189.669,mm" alignment="0" minBarWidth="50" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="1" labelBarSpace="3" height="3" numUnitsPerSegment="100" background="false" groupUuid="" segmentMillimeters="26.3519" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="7,189.669,mm" lineJoinStyle="miter" itemRotation="0" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" maxBarWidth="150" outlineWidthM="0.3,mm" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" numSegments="4" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Single Box" size="145.54,16.2165,mm" id="" zValue="2">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem numUnitsPerSegment="100" zValue="2" background="false" numSegmentsLeft="2" blendMode="0" labelHorizontalPlacement="0" frame="false" minBarWidth="50" labelBarSpace="3" groupUuid="" opacity="1" type="65646" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" maxBarWidth="150" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" frameJoinStyle="miter" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" alignment="0" numSubdivisions="1" numSegments="4" boxContentSpace="1" lineJoinStyle="miter" segmentSizeMode="1" referencePoint="0" unitType="meters" id="" subdivisionsHeight="1.5" visibility="1" outlineWidth="0.3" positionOnPage="7,189.669,mm" segmentMillimeters="26.3519" style="Single Box" labelVerticalPlacement="0" position="7,189.669,mm" lineCapStyle="square" size="145.54,16.2165,mm" outlineWidthM="0.3,mm" unitLabel="m" height="3" positionLock="true" itemRotation="0" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 blue="0" red="0" green="0" alpha="255"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <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 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" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" red="0" green="0" alpha="255"/>
-        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{89036785-f311-478b-b997-5a2119fbdd2c}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{987cde69-791e-42ba-9c64-bbe76719b954}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="7,5.5,mm" visibility="1" followPreset="true" position="7,5.5,mm" itemRotation="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" id="" size="278.027,180.318,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="330" background="false" excludeFromExports="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Start/Finish" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="7,5.5,mm" mapFlags="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" groupUuid="" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Start/Finish" id="" labelMargin="0,mm" size="278.027,180.318,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="330" positionOnPage="7,5.5,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.40843143571575169" ymax="-33.89880140828828559" ymin="-33.90494830469008747"/>
+        <Extent ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="3" leftFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="1" blendMode="0" intervalY="5" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="4" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="5" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="3" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomAnnotationDisplay="3" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -24389,58 +24399,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -24448,117 +24458,117 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
-          <Option value="0" name="svgCropMarginBottom" type="QString"/>
-          <Option value="0" name="svgCropMarginLeft" type="QString"/>
-          <Option value="0" name="svgCropMarginRight" type="QString"/>
-          <Option value="0" name="svgCropMarginTop" type="QString"/>
-          <Option value="true" name="svgCropToContents" type="QString"/>
-          <Option value="0" name="svgDisableRasterTiles" type="QString"/>
-          <Option value="false" name="svgGroupLayers" type="QString"/>
-          <Option value="1" name="svgIncludeMetadata" type="QString"/>
-          <Option value="0" name="svgTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
+          <Option name="svgCropMarginBottom" value="0" type="QString"/>
+          <Option name="svgCropMarginLeft" value="0" type="QString"/>
+          <Option name="svgCropMarginRight" value="0" type="QString"/>
+          <Option name="svgCropMarginTop" value="0" type="QString"/>
+          <Option name="svgCropToContents" value="true" type="QString"/>
+          <Option name="svgDisableRasterTiles" value="0" type="QString"/>
+          <Option name="svgGroupLayers" value="false" type="QString"/>
+          <Option name="svgIncludeMetadata" value="1" type="QString"/>
+          <Option name="svgTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="start_finish_area" hideCoverage="1" sortKey="area" pageNameExpression="&quot;area&quot;" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="start_finish_area" coverageLayerProvider="ogr" pageNameExpression="&quot;area&quot;" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" sortKey="area" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Cones" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Cones" worldFileMap="" printResolution="300" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" groupUuid="" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{acff6c17-7d68-4552-8826-25f0be803e5b}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -24566,15 +24576,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="256.808,5.21277,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="0" referencePoint="0" frameJoinStyle="miter" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" itemRotation="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="38.1563,67.2879,mm" id="" symbolHeight="4" zValue="11">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="11" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="true" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" frameJoinStyle="miter" legendFilterByAtlas="0" equalColumnWidth="1" titleAlignment="1" resizeToContents="0" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="256.808,5.21277,mm" rasterBorderColor="0,0,0,255" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" position="256.808,5.21277,mm" size="38.1563,67.2879,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24585,242 +24595,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2.5" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="9" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -24830,33 +24840,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Fencing and Cones" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="fencing" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+                  <Option name="legend/expressionFilter" value="" type="QString"/>
+                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -24864,77 +24874,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,191.188,mm" marginX="0" visibility="1" position="6.76779,191.188,mm" itemRotation="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" id="" size="148.46,6.45211,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="10" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="CONES: [% &quot;name&quot; %]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,191.188,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" groupUuid="" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="CONES: [% &quot;name&quot; %]" size="148.46,6.45211,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="6.76779,191.188,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="10">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="182.723,191.188,mm" visibility="1" position="182.723,191.188,mm" itemRotation="0" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" id="" size="56.3557,6.45237,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="56.3557" frame="false" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" sectionY="0" background="false" excludeFromExports="0" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" sectionHeight="5.76">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" position="182.723,191.188,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" groupUuid="" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="56.3557" size="56.3557,6.45237,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="5.76" blendMode="0" sectionY="0" positionOnPage="182.723,191.188,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="9">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -24942,207 +24952,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="212.257,198.083,mm" marginX="0" visibility="1" position="212.257,198.083,mm" itemRotation="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" id="" size="26.8205,6.82826,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="212.257,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" groupUuid="" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="2" labelText="REVISION 1.1" size="26.8205,6.82826,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="212.257,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="116.805,198.083,mm" marginX="0" visibility="1" position="116.805,198.083,mm" itemRotation="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" id="" size="64.7594,7.10512,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="6" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="116.805,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" groupUuid="" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" size="64.7594,7.10512,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="116.805,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="6">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="6.76779,198.083,mm" marginX="0" visibility="1" position="6.76779,198.083,mm" itemRotation="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" id="" size="52.7903,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Page [% @atlas_featurenumber %]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" groupUuid="" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="Page [% @atlas_featurenumber %]" size="52.7903,7.07327,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="6.76779,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="243.098,175.353,mm" visibility="1" mode="1" position="243.098,175.353,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northMode="0" id="" size="49.3143,29.8354,mm" pictureRotation="0" pictureHeight="28.0105" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="243.098,175.353,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" groupUuid="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" opacity="1" pictureWidth="49.3143" northOffset="0" anchorPoint="8" visibility="1" id="" size="49.3143,29.8354,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="243.098,175.353,mm" excludeFromExports="0" pictureHeight="28.0105" positionLock="true" referencePoint="0" zValue="4" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -25150,380 +25160,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.91779,197.79,mm" shapeType="1" visibility="1" position="6.91779,197.79,mm" itemRotation="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" id="" size="232.01,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.91779,197.79,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" groupUuid="" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" visibility="1" id="" size="232.01,0.14328,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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 type="65646" outlineWidth="0.2" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="6.76779,2.8482,mm" alignment="0" minBarWidth="25" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="0.2" labelBarSpace="1" height="2" numUnitsPerSegment="500" background="false" groupUuid="" segmentMillimeters="30.2878" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="6.76779,2.8482,mm" lineJoinStyle="round" itemRotation="0" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" maxBarWidth="100" outlineWidthM="0.3,mm" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" numSegments="2" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Double Box" size="104.399,15.8378,mm" id="" zValue="2">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem numUnitsPerSegment="500" zValue="2" background="false" numSegmentsLeft="2" blendMode="0" labelHorizontalPlacement="0" frame="false" minBarWidth="25" labelBarSpace="1" groupUuid="" opacity="1" type="65646" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" maxBarWidth="100" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" frameJoinStyle="miter" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" alignment="0" numSubdivisions="1" numSegments="2" boxContentSpace="0.2" lineJoinStyle="round" segmentSizeMode="1" referencePoint="0" unitType="meters" id="" subdivisionsHeight="1.5" visibility="1" outlineWidth="0.2" positionOnPage="6.76779,2.8482,mm" segmentMillimeters="30.2878" style="Double Box" labelVerticalPlacement="0" position="6.76779,2.8482,mm" lineCapStyle="square" size="104.399,15.8378,mm" outlineWidthM="0.3,mm" unitLabel="m" height="2" positionLock="true" itemRotation="0" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 blue="0" red="0" green="0" alpha="255"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <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 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" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" red="0" green="0" alpha="255"/>
-        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ae895973-56d3-4fc1-86c6-c98493abf339}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c0c92035-0ffd-446d-b579-16536dd36b75}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" visibility="1" followPreset="true" position="6.76779,9.35102,mm" itemRotation="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" id="" size="283.418,180.92,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Fencing" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,9.35102,mm" mapFlags="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" groupUuid="" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Fencing" id="" labelMargin="0,mm" size="283.418,180.92,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="6.76779,9.35102,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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.4000263443481451" xmin="18.35799642373368457" ymax="-33.92282769675948373" ymin="-33.94965747213089458"/>
+        <Extent ymin="-33.94965747213089458" ymax="-33.92282769675948373" xmax="18.4000263443481451" xmin="18.35799642373368457"/>
         <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>
@@ -25538,92 +25548,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="3" leftFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="1" blendMode="0" intervalY="5" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="4" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="5" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="3" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomAnnotationDisplay="3" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{e73cb565-3046-4259-89ee-05f5d6c61953}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -25640,58 +25650,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -25699,21 +25709,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutMultiFrame url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" evaluateExpressions="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
+      <LayoutMultiFrame maxBreakDistance="10" url="" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" resizeMode="0" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" useSmartBreaks="true" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}">
         <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25723,250 +25733,250 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="rasterize" type="QString"/>
-          <Option value="true" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="true" type="QString"/>
+          <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="cone_groups" hideCoverage="1" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filterFeatures="0" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerName="cone_groups" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" sortKey="&quot;group&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="9" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="9" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{20578607-b7b1-4298-b229-e8f94e47157a}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" groupUuid="" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="4.43449,186.634,mm" marginX="1" visibility="1" position="4.43449,186.634,mm" itemRotation="0" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" id="" size="83.9998,10.4638,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Directions to Start of Race" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="4.43449,186.634,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" groupUuid="" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="Directions to Start of Race" size="83.9998,10.4638,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="4.43449,186.634,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="4.43449,197.498,mm" marginX="1" visibility="1" position="4.43449,197.498,mm" itemRotation="0" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" id="" size="48.2923,9.511,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Gun Run" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="4.43449,197.498,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" groupUuid="" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" htmlState="0" marginX="1" valign="32" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="Gun Run" size="48.2923,9.511,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="4.43449,197.498,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="7">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="10.096,10.8563,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="9" rasterBorderWidth="0" boxSpace="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" equalColumnWidth="0" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" legendFilterByMap="1" resizeToContents="1" referencePoint="0" frameJoinStyle="round" positionOnPage="10.096,10.8563,mm" minSymbolSize="0" itemRotation="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="0" positionLock="false" size="59.0766,76,mm" id="" symbolHeight="5" zValue="6">
-        <FrameColor blue="139" red="139" green="139" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="6" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="9" frame="true" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="0" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" frameJoinStyle="round" legendFilterByAtlas="0" legendFilterByMap="1" equalColumnWidth="0" titleAlignment="1" resizeToContents="1" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="10.096,10.8563,mm" rasterBorderColor="0,0,0,255" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" position="10.096,10.8563,mm" size="59.0766,76,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="false" itemRotation="0" wmsLegendHeight="25" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" symbolHeight="5" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="139" green="139" red="139"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -25977,242 +25987,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="7.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="16" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="7.6444479999999997" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="6.9388920000000001" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="6.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2.5" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="3" marginTop="2.5">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2.5" marginLeft="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="6.9388920000000001" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -26222,32 +26232,32 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Ask Me" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Ask Me" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option value="hidden" name="legend/title-style" type="QString"/>
+                <Option name="legend/title-style" value="hidden" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="poi_labels" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="Start/Finish" name="legend/label-0" type="QString"/>
-                  <Option value="Toilets" name="legend/label-1" type="QString"/>
-                  <Option value="Tog Bag Drop-off" name="legend/label-2" type="QString"/>
-                  <Option value="Road Closed to Cars" name="legend/label-3" type="QString"/>
-                  <Option value="MyCiti Drop-off" name="legend/label-4" type="QString"/>
-                  <Option value="Parking" name="legend/label-5" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" value="Start/Finish" type="QString"/>
+                  <Option name="legend/label-1" value="Toilets" type="QString"/>
+                  <Option name="legend/label-2" value="Tog Bag Drop-off" type="QString"/>
+                  <Option name="legend/label-3" value="Road Closed to Cars" type="QString"/>
+                  <Option name="legend/label-4" value="MyCiti Drop-off" type="QString"/>
+                  <Option name="legend/label-5" value="Parking" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="directions_to_start" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="To 21KM Start (06:30)" name="legend/label-0" type="QString"/>
-                  <Option value="To 10KM Start (07:30)" name="legend/label-1" type="QString"/>
-                  <Option value="To 5KM Start (08:30)" name="legend/label-2" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
+                  <Option name="legend/label-1" value="To 10KM Start (07:30)" type="QString"/>
+                  <Option name="legend/label-2" value="To 5KM Start (08:30)" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -26255,145 +26265,145 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="221.862,190.027,mm" marginX="1" visibility="1" position="221.862,190.027,mm" itemRotation="0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" id="" size="27.7839,6.871,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="REVISION 1.0" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="221.862,190.027,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" groupUuid="" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" htmlState="0" marginX="1" valign="32" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="REVISION 1.0" size="27.7839,6.871,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="221.862,190.027,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="197.975,197.498,mm" marginX="1" visibility="1" position="197.975,197.498,mm" itemRotation="0" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="4" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="197.975,197.498,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" groupUuid="" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="197.975,197.498,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="4">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="249.646,179.724,mm" visibility="1" mode="1" position="249.646,179.724,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northMode="0" id="" size="42.9838,24.3824,mm" pictureRotation="0" pictureHeight="24.3824" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="24.2337" excludeFromExports="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" opacity="1" positionLock="false" type="65640" groupUuid="" northOffset="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="249.646,179.724,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" groupUuid="" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" opacity="1" pictureWidth="24.2337" northOffset="0" anchorPoint="4" visibility="1" id="" size="42.9838,24.3824,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="249.646,179.724,mm" excludeFromExports="0" pictureHeight="24.3824" positionLock="false" referencePoint="0" zValue="3" resizeMode="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -26401,85 +26411,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="4.58449,197.248,mm" shapeType="1" visibility="1" position="4.58449,197.248,mm" itemRotation="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" id="" size="244.912,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="false" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="4.58449,197.248,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" groupUuid="" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" visibility="1" id="" size="244.912,0.1,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="4.58449,197.248,mm" excludeFromExports="0" positionLock="false" referencePoint="0" shapeType="1" zValue="2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{25dc84af-8724-465b-a42c-c6c013132998}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{25dc84af-8724-465b-a42c-c6c013132998}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="4.43449,6.411,mm" visibility="1" followPreset="true" position="4.43449,6.411,mm" itemRotation="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" size="288.007,183.616,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" positionLock="false" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Ask Me" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="4.43449,6.411,mm" mapFlags="0" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" groupUuid="" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Ask Me" id="" labelMargin="0,mm" size="288.007,183.616,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="4.43449,6.411,mm" followPreset="true" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.39762336729721071" ymax="-33.8970204297764468" ymin="-33.90994364588821952"/>
+        <Extent ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -26494,149 +26504,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -26644,318 +26654,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" hideCoverage="0" pageNameExpression="" coverageLayer="" sortFeatures="0" filterFeatures="0"/>
+      <Atlas pageNameExpression="" coverageLayer="" hideCoverage="0" filterFeatures="0" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" sortFeatures="0"/>
     </Layout>
-    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Routes" worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" printResolution="144" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" groupUuid="" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="200.171,199.082,mm" marginX="0" visibility="1" position="200.171,199.082,mm" itemRotation="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" id="" size="61.5373,6.8714,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="13" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.7" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="200.171,199.082,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" groupUuid="" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="2" labelText="REVISION 1.7" size="61.5373,6.8714,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="200.171,199.082,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="13">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="9.7863,192.073,mm" marginX="0" visibility="1" position="9.7863,192.073,mm" itemRotation="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" id="" size="61.5373,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="12" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Gun Run 2023: [%&quot;Source&quot;%]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.7863,192.073,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" groupUuid="" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" htmlState="0" marginX="0" valign="64" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="Gun Run 2023: [%&quot;Source&quot;%]" size="61.5373,6.60801,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="9.7863,192.073,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="12">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="9.7863,199.082,mm" marginX="0" visibility="1" position="9.7863,199.082,mm" itemRotation="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" id="" size="61.5373,6.60801,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="11" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.7863,199.082,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" groupUuid="" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" size="61.5373,6.60801,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="9.7863,199.082,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="11">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="16.8993" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="10" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="29.7523" excludeFromExports="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="262.196,188.218,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" groupUuid="" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" opacity="1" pictureWidth="29.7523" northOffset="0" anchorPoint="4" visibility="1" id="" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="262.196,188.218,mm" excludeFromExports="0" pictureHeight="16.8993" positionLock="true" referencePoint="0" zValue="10" resizeMode="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -26963,374 +26973,374 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.57644,198.832,mm" shapeType="1" visibility="1" position="9.57644,198.832,mm" itemRotation="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" id="" size="251.982,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="9" frame="false" background="false" excludeFromExports="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.57644,198.832,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" groupUuid="" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" visibility="1" id="" size="251.982,0.1,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="9.57644,198.832,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="9">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{04656074-3faa-4640-ae80-a44a8cb036f7}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="8.21644,4.09761,mm" visibility="1" followPreset="true" position="8.21644,4.09761,mm" itemRotation="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" id="Trail Finish" size="109.221,188.689,mm" frameJoinStyle="miter" blendMode="0" zValue="8" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="8.21644,4.09761,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" groupUuid="" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" keepLayerSet="false" drawCanvasItems="true" isTemporal="0" visibility="1" followPresetName="Routes" id="Trail Finish" labelMargin="0,mm" size="109.221,188.689,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="8.21644,4.09761,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.41187375074135701" xmin="18.39314911415855391" ymax="-33.90007966676468953" ymin="-33.93242806047424409"/>
+        <Extent ymin="-33.93242806047424409" ymax="-33.90007966676468953" xmax="18.41187375074135701" xmin="18.39314911415855391"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="113.002,2.39423,mm" visibility="1" followPreset="true" position="113.002,2.39423,mm" itemRotation="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" id="Trail Start" size="179.156,191.505,mm" frameJoinStyle="miter" blendMode="0" zValue="7" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="113.002,2.39423,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" groupUuid="" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" keepLayerSet="false" drawCanvasItems="true" isTemporal="0" visibility="1" followPresetName="Routes" id="Trail Start" labelMargin="0,mm" size="179.156,191.505,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="113.002,2.39423,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="7">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = 'Trail', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42354248737832023" xmin="18.3924263991010406" ymax="-33.92465573363980269" ymin="-33.95791657202656921"/>
+        <Extent ymin="-33.95791657202656921" ymax="-33.92465573363980269" xmax="18.42354248737832023" xmin="18.3924263991010406"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" visibility="1" followPreset="true" position="5.86559,4.09761,mm" itemRotation="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" id="Left inset 21KM" size="67.7828,166.874,mm" frameJoinStyle="miter" blendMode="0" zValue="6" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.86559,4.09761,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" groupUuid="" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Routes" id="Left inset 21KM" labelMargin="0,mm" size="67.7828,166.874,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="5.86559,4.09761,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="6">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedMapScale" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '12500'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.424'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '18.419'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '18.417'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '18.374'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMax" type="Map">
-                  <Option value="false" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="false" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.893'&#xa;WHEN &quot;RouteLen&quot; = '10' THEN '-33.897'&#xa;WHEN &quot;RouteLen&quot; = '5'  THEN '-33.898'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;RouteLen&quot; = '21' THEN '-33.947'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.38626092146919788" xmin="18.37399999999999878" ymax="-33.91681492292400435" ymin="-33.94700000000000273"/>
+        <Extent ymin="-33.94700000000000273" ymax="-33.91681492292400435" xmax="18.38626092146919788" xmin="18.37399999999999878"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="131.391,120.702,mm" visibility="1" followPreset="true" position="131.391,120.702,mm" itemRotation="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" id="Bottom inset 21KM" size="113.3,76.1023,mm" frameJoinStyle="miter" blendMode="0" zValue="5" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
-        <FrameColor blue="144" red="103" green="34" alpha="255"/>
-        <BackgroundColor blue="215" red="200" green="175" alpha="128"/>
+      <LayoutItem position="131.391,120.702,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" groupUuid="" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" keepLayerSet="false" drawCanvasItems="true" isTemporal="0" visibility="1" followPresetName="Routes" id="Bottom inset 21KM" labelMargin="0,mm" size="113.3,76.1023,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="131.391,120.702,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="144" green="34" red="103"/>
+        <BackgroundColor alpha="128" blue="215" green="175" red="200"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties" type="Map">
                 <Option name="dataDefinedOpacity" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="100.0 - (if( &quot;Source&quot; = '21KM', '0', '100' ))" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
               </Option>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42329132157224336" xmin="18.41509620662891678" ymax="-33.91132718340826813" ymin="-33.9168317482614512"/>
+        <Extent ymin="-33.9168317482614512" ymax="-33.91132718340826813" xmax="18.42329132157224336" xmin="18.41509620662891678"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="1" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="1"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="8.14144,4.02261,mm" visibility="1" followPreset="true" position="8.14144,4.02261,mm" itemRotation="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" id="Main Map" size="282.732,188.839,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="8.14144,4.02261,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="round" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" groupUuid="" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" keepLayerSet="false" drawCanvasItems="true" isTemporal="0" visibility="1" followPresetName="Routes" id="Main Map" labelMargin="0,mm" size="282.732,188.839,mm" outlineWidthM="0.15,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="8.14144,4.02261,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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 '10500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '12500'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '10500'&#xa;WHEN &quot;Source&quot; ILIKE '5KM%'  THEN '4500'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '22000'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapXMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" name="expression" type="QString"/>
-                  <Option value="3" name="type" type="int"/>
+                  <Option name="active" value="true" type="bool"/>
+                  <Option name="expression" value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '18.372'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '18.392'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' THEN '18.399'&#xa;WHEN &quot;Source&quot; = 'Trail'THEN '18.364'&#xa;END" type="QString"/>
+                  <Option name="type" value="3" type="int"/>
                 </Option>
                 <Option name="dataDefinedMapYMin" type="Map">
-                  <Option value="true" name="active" type="bool"/>
-                  <Option value="CASE&#xa;WHEN &quot;Source&quot; = '21KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; = '10KM' THEN '-33.926'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' 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="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.926'&#xa;WHEN &quot;Source&quot; ILIKE '%Dog Walk' THEN '-33.910'&#xa;WHEN &quot;Source&quot; ILIKE '%Fun Run' 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 value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent xmax="18.42312398088981951" xmin="18.37199999999999989" ymax="-33.8918539481981469" ymin="-33.92600000000000193"/>
+        <Extent ymin="-33.92600000000000193" ymax="-33.8918539481981469" xmax="18.42312398088981951" xmin="18.37199999999999989"/>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -27338,40 +27348,40 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" name="Overview 1" show="1" blendMode="0" centered="1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" inverted="0">
-          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <ComposerMapOverview centered="1" name="Overview 1" show="1" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" position="3" inverted="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="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 enabled="1" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27379,9 +27389,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>
@@ -27389,115 +27399,115 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
+        <AtlasMap margin="0.06" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709" 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 filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" enabled="1" coverageLayerName="all_routes" hideCoverage="0" sortKey="&quot;Sort&quot;" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filterFeatures="1" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="all_routes" coverageLayerProvider="ogr" pageNameExpression="&quot;Distance&quot;" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" hideCoverage="0" filterFeatures="1" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" sortKey="&quot;Sort&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Marshal Plan A1" worldFileMap="" printResolution="120" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{65fd4b73-0525-4952-b52a-060921d10d24}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" size="594,841,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" groupUuid="" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" visibility="1" id="" size="594,841,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ca38df31-0d5f-4457-be79-18d8add56004}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -27505,15 +27515,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="25.5925,18.7971,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="false" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="25.5925,18.7971,mm" minSymbolSize="0" itemRotation="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="4,4,mm" id="" symbolHeight="4" zValue="8">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="8" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="false" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" frameJoinStyle="miter" legendFilterByAtlas="0" equalColumnWidth="1" titleAlignment="1" resizeToContents="1" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="25.5925,18.7971,mm" rasterBorderColor="0,0,0,255" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" position="25.5925,18.7971,mm" size="4,4,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -27524,242 +27534,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="16" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="6.6444479999999997" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.9388920000000001" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="1">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="1" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -27769,17 +27779,17 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" checked="Qt::Checked">
+            <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" checked="Qt::Checked" id="all_routes20170907054841602" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="1,2,3" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="QString"/>
+                  <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -27787,207 +27797,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.2963,808.939,mm" marginX="1" visibility="1" position="5.2963,808.939,mm" itemRotation="0" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" id="" size="91.9494,15.0649,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="MARSHAL POSITIONS" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.2963,808.939,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" groupUuid="" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="MARSHAL POSITIONS" size="91.9494,15.0649,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="5.2963,808.939,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="7">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="430.403,825.052,mm" marginX="1" visibility="1" position="430.403,825.052,mm" itemRotation="0" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" id="" size="56.6212,15.3656,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.2" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="430.403,825.052,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" groupUuid="" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" htmlState="0" marginX="1" valign="32" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="REVISION 1.2" size="56.6212,15.3656,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="430.403,825.052,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="372.175,808.942,mm" marginX="1" visibility="1" position="372.175,808.942,mm" itemRotation="0" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" id="" size="114.848,15.0635,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="4" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="372.175,808.942,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" groupUuid="" uuid="{d177957c-7ab6-40ae-8769-347428500538}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="Sunday, 20 October 2019" size="114.848,15.0635,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="372.175,808.942,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="4">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="489.557,775.395,mm" visibility="1" mode="1" position="489.557,775.395,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northMode="0" id="" size="100.498,63.9757,mm" pictureRotation="0" pictureHeight="63.9757" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="63.5856" excludeFromExports="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="489.557,775.395,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" groupUuid="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" opacity="1" pictureWidth="63.5856" northOffset="0" anchorPoint="8" visibility="1" id="" size="100.498,63.9757,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="489.557,775.395,mm" excludeFromExports="0" pictureHeight="63.9757" positionLock="true" referencePoint="0" zValue="3" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -27995,199 +28005,199 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.4463,824.155,mm" shapeType="1" visibility="1" position="5.4463,824.155,mm" itemRotation="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" id="" size="481.428,0.606138,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.4463,824.155,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" groupUuid="" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" opacity="1" visibility="1" id="" size="481.428,0.606138,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="5.4463,824.155,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="3.94474,5.25965,mm" visibility="1" followPreset="true" position="3.94474,5.25965,mm" itemRotation="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" id="" size="584.759,811.213,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal plan" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="3.94474,5.25965,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" groupUuid="" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Marshal plan" id="" labelMargin="0,mm" size="584.759,811.213,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="3.94474,5.25965,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.37434415142052657" ymax="-33.89072661913806428" ymin="-33.95821655848814657"/>
+        <Extent ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="complete_marshal_overview" hideCoverage="1" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filterFeatures="0" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerName="complete_marshal_overview" coverageLayerProvider="virtual" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" sortKey="page" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Access Roads" worldFileMap="" printResolution="144" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" groupUuid="" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{038e2492-f412-42ba-8703-4c8f318a87c2}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="244.484,130.172,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" equalColumnWidth="0" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="244.484,130.172,mm" minSymbolSize="0" itemRotation="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="34.45,40.8,mm" id="" symbolHeight="4" zValue="15">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="185"/>
+      <LayoutItem zValue="15" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="true" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" frameJoinStyle="miter" legendFilterByAtlas="0" equalColumnWidth="0" titleAlignment="1" resizeToContents="1" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="244.484,130.172,mm" rasterBorderColor="0,0,0,255" position="244.484,130.172,mm" size="34.45,40.8,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="185" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -28195,242 +28205,242 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.9388920000000001" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2.5" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="9" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -28440,15 +28450,15 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Residents Access" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Residents Access" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="residents_access_roads" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -28456,207 +28466,207 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.37446,191.81,mm" marginX="0" visibility="1" position="9.37446,191.81,mm" itemRotation="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" id="" size="194.851,7.272,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="ACCESS ROUTES FOR RESIDENTS" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.37446,191.81,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" groupUuid="" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" htmlState="0" marginX="0" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="ACCESS ROUTES FOR RESIDENTS" size="194.851,7.272,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="9.37446,191.81,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="204.225,191.81,mm" marginX="1" visibility="1" position="204.225,191.81,mm" itemRotation="0" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" id="" size="57.4836,6.8714,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="6" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="204.225,191.81,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" groupUuid="" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="REVISION 1.1" size="57.4836,6.8714,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="204.225,191.81,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="6">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="210.038,199.082,mm" marginX="1" visibility="1" position="210.038,199.082,mm" itemRotation="0" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="210.038,199.082,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" groupUuid="" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="210.038,199.082,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653" excludeFromExports="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="262.196,188.218,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" groupUuid="" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" opacity="1" pictureWidth="17.3653" northOffset="0" anchorPoint="4" visibility="1" id="" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="262.196,188.218,mm" excludeFromExports="0" pictureHeight="17.4718" positionLock="true" referencePoint="0" zValue="4" resizeMode="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -28664,100 +28674,100 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" position="9.59946,198.832,mm" itemRotation="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" id="" size="251.959,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.59946,198.832,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" groupUuid="" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" opacity="1" visibility="1" id="" size="251.959,0.1,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" visibility="1" followPreset="true" position="5.86559,4.09761,mm" itemRotation="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" id="" size="67.7828,166.874,mm" frameJoinStyle="miter" blendMode="0" zValue="2" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Access Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.86559,4.09761,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="miter" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" groupUuid="" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Access Routes" id="" labelMargin="0,mm" size="67.7828,166.874,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="5.86559,4.09761,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.37288570000000121" ymax="-33.91513741583252539" ymin="-33.94652930000000168"/>
+        <Extent ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -28772,149 +28782,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -28922,45 +28932,45 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
+        <AtlasMap margin="0.05" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.15,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="9.44946,9.08557,mm" visibility="1" followPreset="true" position="9.44946,9.08557,mm" itemRotation="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" id="" size="282.012,175.592,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Access Routes" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.44946,9.08557,mm" mapFlags="0" background="true" itemRotation="0" frame="true" frameJoinStyle="round" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" groupUuid="" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Access Routes" id="" labelMargin="0,mm" size="282.012,175.592,mm" outlineWidthM="0.15,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="9.44946,9.08557,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.37000000000000099" ymax="-33.89697816224119009" ymin="-33.92999999999999972"/>
+        <Extent ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -28975,149 +28985,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{ebfdf781-190f-4651-9709-789cb68c9533}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -29125,318 +29135,318 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="1" coverageLayerName="residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="residents_access" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
     </Layout>
-    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{c6a999b7-046a-4375-b775-24bfc19b454c}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" groupUuid="" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{cef79093-d3c5-4edf-9190-66f460844f01}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide orientation="2" units="mm" position="0" page="0"/>
+          <Guide page="0" orientation="2" position="0" units="mm"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.37446,191.81,mm" marginX="0" visibility="1" position="9.37446,191.81,mm" itemRotation="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" id="" size="194.851,7.272,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Access to P9 Parking and VIP Tent" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.37446,191.81,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" groupUuid="" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" htmlState="0" marginX="0" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="Access to P9 Parking and VIP Tent" size="194.851,7.272,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="9.37446,191.81,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="204.225,191.81,mm" marginX="1" visibility="1" position="204.225,191.81,mm" itemRotation="0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" id="" size="57.4836,6.8714,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="6" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.0" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="204.225,191.81,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" groupUuid="" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="REVISION 1.0" size="57.4836,6.8714,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="204.225,191.81,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="6">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="210.038,199.082,mm" marginX="1" visibility="1" position="210.038,199.082,mm" itemRotation="0" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="210.038,199.082,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" groupUuid="" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" htmlState="0" marginX="1" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="Sunday, 20 October 2019" size="51.6706,6.60801,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="210.038,199.082,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653" excludeFromExports="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="262.196,188.218,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" groupUuid="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" opacity="1" pictureWidth="17.3653" northOffset="0" anchorPoint="4" visibility="1" id="" size="29.7523,17.4718,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="262.196,188.218,mm" excludeFromExports="0" pictureHeight="17.4718" positionLock="true" referencePoint="0" zValue="4" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -29444,85 +29454,85 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" position="9.59946,198.832,mm" itemRotation="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" id="" size="251.959,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.59946,198.832,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" groupUuid="" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" opacity="1" visibility="1" id="" size="251.959,0.1,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="9.59946,198.832,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{025604c1-b118-4f15-b140-54c9145260c4}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{025604c1-b118-4f15-b140-54c9145260c4}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="9.44946,7.25098,mm" visibility="1" followPreset="false" position="9.44946,7.25098,mm" itemRotation="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" id="" size="282.012,182.649,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" positionLock="false" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="9.44946,7.25098,mm" mapFlags="0" background="true" itemRotation="0" frame="false" frameJoinStyle="round" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" groupUuid="" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="" id="" labelMargin="0,mm" size="282.012,182.649,mm" outlineWidthM="0.15,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="9.44946,7.25098,mm" followPreset="false" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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" xmin="18.40103928699269886" ymax="-33.90319854486631357" ymin="-33.90848231674397084"/>
+        <Extent ymin="-33.90848231674397084" ymax="-33.90319854486631357" xmax="18.40919746780259914" xmin="18.40103928699269886"/>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
             <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
@@ -29537,149 +29547,149 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="0" leftFrameDivisions="0" leftAnnotationDisplay="0" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="0" blendMode="0" intervalY="0" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="0" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="0" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="0" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" bottomAnnotationDisplay="0" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -29687,108 +29697,108 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
+        <AtlasMap margin="0.10000000000000001" atlasDriven="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="QString"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="QString"/>
-          <Option value="0" name="pdfTextFormat" type="QString"/>
-          <Option value="false" name="singleFile" type="QString"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="QString"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="QString"/>
+          <Option name="pdfTextFormat" value="0" type="QString"/>
+          <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="0" coverageLayerName="residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="residents_access" coverageLayerProvider="ogr" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" hideCoverage="1" filterFeatures="0" enabled="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" sortFeatures="0"/>
     </Layout>
-    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Marshal Plan" worldFileMap="" printResolution="120" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" size="297,420,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" groupUuid="" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" visibility="1" id="" size="297,420,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -29796,15 +29806,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="112.086,406.476,mm" visibility="1" position="112.086,406.476,mm" itemRotation="0" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" id="" size="23.5967,8.3142,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="23.5967" frame="false" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" sectionY="0" background="false" excludeFromExports="0" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" sectionHeight="8.3142">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" position="112.086,406.476,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" groupUuid="" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="23.5967" size="23.5967,8.3142,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="8.3142" blendMode="0" sectionY="0" positionOnPage="112.086,406.476,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="9">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29812,139 +29822,139 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="214.292,406.874,mm" marginX="0" visibility="1" position="214.292,406.874,mm" itemRotation="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" id="" size="27.7839,7.51682,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.8" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="214.292,406.874,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" groupUuid="" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="1" id="" halign="2" labelText="REVISION 1.10" size="27.7839,7.51682,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="214.292,406.874,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="5.69321,398.344,mm" marginX="0" visibility="1" position="5.69321,398.344,mm" itemRotation="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" id="" size="45.1194,8.13137,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="MARSHAL POSITIONS" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.69321,398.344,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" groupUuid="" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" htmlState="0" marginX="0" valign="64" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="MARSHAL POSITIONS" size="45.1194,8.13137,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="5.69321,398.344,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="7">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="15.6525,12.5708,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="false" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="15.6525,12.5708,mm" minSymbolSize="0" itemRotation="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="21.8263,33.2917,mm" id="" symbolHeight="4" zValue="6">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="6" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="false" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" frameJoinStyle="miter" legendFilterByAtlas="0" equalColumnWidth="1" titleAlignment="1" resizeToContents="1" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="15.6525,12.5708,mm" rasterBorderColor="0,0,0,255" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" position="15.6525,12.5708,mm" size="21.8263,33.2917,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -29955,242 +29965,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="16" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="6.6444479999999997" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="14" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.9388920000000001" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="1">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="1" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -30200,19 +30210,19 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option type="Map">
-                <Option value="group" name="legend/title-style" type="QString"/>
+                <Option name="legend/title-style" value="group" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30220,15 +30230,15 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="5.69321,406.988,mm" visibility="1" position="5.69321,406.988,mm" itemRotation="0" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" id="" size="118.192,7.80192,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="5" sectionWidth="118.192" frame="false" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" sectionY="0" background="false" excludeFromExports="0" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" sectionHeight="7.80192">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" position="5.69321,406.988,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" groupUuid="" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="118.192" size="118.192,7.80192,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="7.80192" blendMode="0" sectionY="0" positionOnPage="5.69321,406.988,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30236,15 +30246,15 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="148.501,398.344,mm" visibility="1" position="148.501,398.344,mm" itemRotation="0" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" id="" size="93.5757,8.13167,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="4" sectionWidth="93.5757" frame="false" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" sectionY="0" background="false" excludeFromExports="0" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" sectionHeight="8.13167">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" position="148.501,398.344,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" groupUuid="" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="93.5757" size="93.5757,8.13167,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="8.13167" blendMode="0" sectionY="0" positionOnPage="148.501,398.344,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="4">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30252,21 +30262,21 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="243.319,382.696,mm" visibility="1" mode="1" position="243.319,382.696,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" northMode="0" id="" size="49.3143,31.2967,mm" pictureRotation="0" pictureHeight="27.9119" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../../Gun Run 2023.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="243.319,382.696,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" groupUuid="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" opacity="1" pictureWidth="49.3143" northOffset="0" anchorPoint="8" visibility="1" id="" size="49.3143,31.2967,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../../Gun Run 2023.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="243.319,382.696,mm" excludeFromExports="0" pictureHeight="27.9119" positionLock="true" referencePoint="0" zValue="3" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -30274,101 +30284,101 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.84321,406.626,mm" shapeType="1" visibility="1" position="5.84321,406.626,mm" itemRotation="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" id="" size="236.083,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.84321,406.626,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" groupUuid="" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" opacity="1" visibility="1" id="" size="236.083,0.14328,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="5.84321,406.626,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="2">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.03,5.9483,mm" visibility="1" followPreset="true" position="5.03,5.9483,mm" itemRotation="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" id="" size="286.94,392.396,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal plan" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="5.03,5.9483,mm" mapFlags="0" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" groupUuid="" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Marshal plan" id="" labelMargin="0,mm" size="286.94,392.396,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="5.03,5.9483,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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.41474568521422484" xmin="18.39785407807089612" ymax="-33.89580042337001231" ymin="-33.91890002608484167"/>
+        <Extent ymin="-33.91890002608484167" ymax="-33.89580042337001231" xmax="18.41474568521422484" xmin="18.39785407807089612"/>
         <LayerSet/>
-        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
+        <AtlasMap margin="0" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutMultiFrame url="" html="Page [% &quot;page&quot; %] " evaluateExpressions="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }">
+      <LayoutMultiFrame maxBreakDistance="10" url="" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }" resizeMode="0" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="Page [% &quot;page&quot; %] " useSmartBreaks="true" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}">
         <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30376,14 +30386,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame url="" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" evaluateExpressions="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }">
+      <LayoutMultiFrame maxBreakDistance="10" url="" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }" resizeMode="0" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" useSmartBreaks="true" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}">
         <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30391,14 +30401,14 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame url="" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" evaluateExpressions="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }">
+      <LayoutMultiFrame maxBreakDistance="10" url="" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }" resizeMode="0" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 16th September, 2023'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 17th September, 2023'&#xa;END&#xa;%]&lt;/strong>" useSmartBreaks="true" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}">
         <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30408,99 +30418,99 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709" 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 filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="marshal_overviews" hideCoverage="1" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerName="marshal_overviews" coverageLayerProvider="ogr" pageNameExpression="&quot;page&quot;" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" sortKey="page" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1"/>
     </Layout>
-    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
-      <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
+    <Layout name="Fencing" worldFileMap="" printResolution="300" units="mm">
+      <Snapper snapToGrid="0" snapToGuides="1" snapToItems="1" tolerance="5"/>
+      <Grid offsetX="0" offsetUnits="mm" offsetY="0" resolution="10" resUnits="mm"/>
       <PageCollection>
-        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
             <Option type="Map">
-              <Option value="3x:0,0,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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" opacity="1" positionLock="false" type="65638" groupUuid="">
-          <FrameColor blue="0" red="0" green="0" alpha="255"/>
-          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+        <LayoutItem position="0,0,mm" background="true" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" groupUuid="" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" opacity="1" visibility="1" id="" size="297,210,mm" outlineWidthM="0.3,mm" type="65638" blendMode="0" positionOnPage="0,0,mm" excludeFromExports="0" positionLock="false" referencePoint="0" zValue="0">
+          <FrameColor alpha="255" blue="0" green="0" red="0"/>
+          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
             </layer>
@@ -30508,15 +30518,15 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="256.808,5.21277,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="0" referencePoint="0" frameJoinStyle="miter" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" itemRotation="0" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="38.1563,68.0108,mm" id="" symbolHeight="4" zValue="11">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem zValue="11" wmsLegendWidth="50" background="true" blendMode="0" minSymbolSize="0" symbolWidth="7" frame="true" title="" rasterBorder="1" groupUuid="" symbolAlignment="1" columnSpace="2" opacity="1" type="65642" rasterBorderWidth="0" excludeFromExports="0" columnCount="1" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" frameJoinStyle="miter" legendFilterByAtlas="0" equalColumnWidth="1" titleAlignment="1" resizeToContents="0" referencePoint="0" id="" splitLayer="0" visibility="1" positionOnPage="256.808,5.21277,mm" rasterBorderColor="0,0,0,255" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" position="256.808,5.21277,mm" size="38.1563,68.0108,mm" outlineWidthM="0.3,mm" maxSymbolSize="0" positionLock="true" itemRotation="0" wmsLegendHeight="25" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" symbolHeight="4" boxSpace="2" wrapChar="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30527,242 +30537,242 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
         </filterByMaps>
         <styles>
-          <style name="title" alignment="1" indent="0">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="title" indent="0" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="group" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="group" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="5.2333359999999995" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="subgroup" alignment="1" indent="0" marginTop="3">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="subgroup" indent="0" marginTop="3" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="75" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbol" indent="0" marginTop="2.5" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="9" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
           </style>
-          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
-            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <style name="symbolLabel" indent="0" marginTop="2" marginLeft="2" alignment="1">
+            <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="4.5277799999999999" allowHtml="0" multilineHeightUnit="MM" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
               <families/>
-              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+              <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+              <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+              <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+                <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="QString"/>
                       <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
+                      <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                  <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                     <Option type="Map">
-                      <Option value="3x:0,0,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>
                     <data_defined_properties>
                       <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
+                        <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+              <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
               <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>
@@ -30772,33 +30782,33 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Fencing and Cones" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="fencing" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
-                  <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
-                  <Option value="" name="legend/expressionFilter" type="QString"/>
-                  <Option value="false" name="legend/expressionFilterEnabled" type="QString"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
+                  <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
+                  <Option name="legend/expressionFilter" value="" type="QString"/>
+                  <Option name="legend/expressionFilterEnabled" value="false" type="QString"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
+          <layer-tree-group expanded="1" name="Routes" checked="Qt::Checked" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
+            <layer-tree-layer expanded="1" name="all_routes" legend_exp="" legend_split_behavior="0" providerKey="ogr" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
-                  <Option value="1,2,3,4" name="legend/node-order" type="QString"/>
-                  <Option value="hidden" name="legend/title-style" type="QString"/>
-                  <Option value="0" name="showFeatureCount" type="int"/>
+                  <Option name="legend/node-order" value="1,2,3,4" type="QString"/>
+                  <Option name="legend/title-style" value="hidden" type="QString"/>
+                  <Option name="showFeatureCount" value="0" type="int"/>
                 </Option>
               </customproperties>
             </layer-tree-layer>
@@ -30806,77 +30816,77 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,191.188,mm" marginX="0" visibility="1" position="6.76779,191.188,mm" itemRotation="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" id="" size="148.46,6.45211,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="10" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="FENCING: [% &quot;name&quot; %]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,191.188,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" groupUuid="" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="FENCING: [% &quot;name&quot; %]" size="148.46,6.45211,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="6.76779,191.188,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="10">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="63" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="182.723,191.188,mm" visibility="1" position="182.723,191.188,mm" itemRotation="0" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" id="" size="56.3557,6.45237,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="56.3557" frame="false" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" sectionY="0" background="false" excludeFromExports="0" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" sectionHeight="5.76">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" position="182.723,191.188,mm" sectionX="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" groupUuid="" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" opacity="1" hidePageIfEmpty="0" visibility="1" id="" hideBackgroundIfEmpty="0" sectionWidth="56.3557" size="56.3557,6.45237,mm" outlineWidthM="0.3,mm" type="65647" sectionHeight="5.76" blendMode="0" sectionY="0" positionOnPage="182.723,191.188,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="9">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -30884,207 +30894,207 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="212.258,198.083,mm" marginX="0" visibility="1" position="212.258,198.083,mm" itemRotation="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" id="" size="26.8205,6.82826,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="212.258,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" groupUuid="" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="2" labelText="REVISION 1.1" size="26.8205,6.82826,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="212.258,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="8">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="62.6706,198.083,mm" marginX="1" visibility="1" position="62.6706,198.083,mm" itemRotation="0" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" id="" size="51.1638,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginY="1">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="62.6706,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" groupUuid="" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" htmlState="0" marginX="1" valign="32" opacity="1" visibility="1" marginY="1" id="" halign="1" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" size="51.1638,7.07327,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="62.6706,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="7">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" positionOnPage="6.76779,198.083,mm" marginX="0" visibility="1" position="6.76779,198.083,mm" itemRotation="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" id="" size="90.2083,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Page [% @atlas_featurenumber %]" marginY="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,198.083,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" groupUuid="" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" htmlState="0" marginX="0" valign="32" opacity="1" visibility="1" marginY="0" id="" halign="1" labelText="Page [% @atlas_featurenumber %]" size="90.2083,7.07327,mm" outlineWidthM="0.3,mm" type="65641" blendMode="0" positionOnPage="6.76779,198.083,mm" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="5">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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" referencePoint="0" resizeMode="0" positionOnPage="243.098,175.353,mm" visibility="1" mode="1" position="243.098,175.353,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" northMode="0" id="" size="49.3143,29.8354,mm" pictureRotation="0" pictureHeight="28.0105" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="243.098,175.353,mm" pictureRotation="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" northMode="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" groupUuid="" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" opacity="1" pictureWidth="49.3143" northOffset="0" anchorPoint="8" visibility="1" id="" size="49.3143,29.8354,mm" svgBorderColor="0,0,0,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" type="65640" svgFillColor="255,255,255,255" svgBorderWidth="0.2" blendMode="0" mode="1" positionOnPage="243.098,175.353,mm" excludeFromExports="0" pictureHeight="28.0105" positionLock="true" referencePoint="0" zValue="4" resizeMode="0" mapUuid="">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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>
@@ -31092,380 +31102,380 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.91779,197.79,mm" shapeType="1" visibility="1" position="6.91779,197.79,mm" itemRotation="0" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" id="" size="232.01,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.91779,197.79,mm" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" groupUuid="" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" opacity="1" visibility="1" id="" size="232.01,0.14328,mm" outlineWidthM="0.3,mm" type="65643" blendMode="0" cornerRadiusMeasure="0,mm" positionOnPage="6.91779,197.79,mm" excludeFromExports="0" positionLock="true" referencePoint="0" shapeType="1" zValue="3">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+        <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" id="{96fb0bca-784b-4a29-b691-c08ef223150d}" locked="0" pass="0" class="SimpleFill">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
             <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>
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="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 type="65646" outlineWidth="0.2" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="6.76779,2.8482,mm" alignment="0" minBarWidth="25" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="0.2" labelBarSpace="1" height="2" numUnitsPerSegment="20" background="false" groupUuid="" segmentMillimeters="25.8173" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="6.76779,2.8482,mm" lineJoinStyle="round" itemRotation="0" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" maxBarWidth="100" outlineWidthM="0.3,mm" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" numSegments="2" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Double Box" size="87.2133,15.8378,mm" id="" zValue="2">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem numUnitsPerSegment="20" zValue="2" background="false" numSegmentsLeft="2" blendMode="0" labelHorizontalPlacement="0" frame="false" minBarWidth="25" labelBarSpace="1" groupUuid="" opacity="1" type="65646" numMapUnitsPerScaleBarUnit="1" excludeFromExports="0" maxBarWidth="100" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" frameJoinStyle="miter" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" alignment="0" numSubdivisions="1" numSegments="2" boxContentSpace="0.2" lineJoinStyle="round" segmentSizeMode="1" referencePoint="0" unitType="meters" id="" subdivisionsHeight="1.5" visibility="1" outlineWidth="0.2" positionOnPage="6.76779,2.8482,mm" segmentMillimeters="25.8173" style="Double Box" labelVerticalPlacement="0" position="6.76779,2.8482,mm" lineCapStyle="square" size="87.2133,15.8378,mm" outlineWidthM="0.3,mm" unitLabel="m" height="2" positionLock="true" itemRotation="0" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="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 fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+        <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="12" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
           <families/>
-          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+          <text-mask maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+          <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+            <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                 <Option type="Map">
-                  <Option value="3x:0,0,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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+          <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
           <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 blue="0" red="0" green="0" alpha="255"/>
+        <strokeColor alpha="255" blue="0" green="0" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
-            <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 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" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" red="0" green="0" alpha="255"/>
-        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
+        <fillColor alpha="255" blue="0" green="0" red="0"/>
+        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
         <lineSymbol>
-          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{ba8b697f-af10-49bc-b789-55678d099479}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{ba8b697f-af10-49bc-b789-55678d099479}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" locked="0" pass="0" class="SimpleLine">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
               <Option type="Map">
-                <Option value="0" name="align_dash_pattern" type="QString"/>
-                <Option value="square" name="capstyle" type="QString"/>
-                <Option value="5;2" name="customdash" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                <Option value="MM" name="customdash_unit" type="QString"/>
-                <Option value="0" name="dash_pattern_offset" type="QString"/>
-                <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{7f05af9e-0111-48af-a2c9-889d710570e0}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
               <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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+          <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
-                <Option value="" name="name" type="QString"/>
+                <Option name="name" value="" type="QString"/>
                 <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
+                <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" id="{c90aa551-e7ed-4710-acac-e5698540a53e}" locked="0" pass="0" class="SimpleFill">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
               <Option type="Map">
-                <Option value="3x:0,0,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>
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="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" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" visibility="1" followPreset="true" position="6.76779,9.35102,mm" itemRotation="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" id="" size="283.418,180.92,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" opacity="0.9" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Fencing" isTemporal="0">
-        <FrameColor blue="0" red="0" green="0" alpha="255"/>
-        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
+      <LayoutItem position="6.76779,9.35102,mm" mapFlags="0" background="false" itemRotation="0" frame="false" frameJoinStyle="miter" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" groupUuid="" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" opacity="0.9" keepLayerSet="false" drawCanvasItems="false" isTemporal="0" visibility="1" followPresetName="Fencing" id="" labelMargin="0,mm" size="283.418,180.92,mm" outlineWidthM="0.3,mm" type="65639" blendMode="0" mapRotation="0" positionOnPage="6.76779,9.35102,mm" followPreset="true" excludeFromExports="0" positionLock="true" referencePoint="0" zValue="1">
+        <FrameColor alpha="255" blue="0" green="0" red="0"/>
+        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" 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.37821516684363488" xmin="18.37624285840067628" ymax="-33.94132830492694808" ymin="-33.94258732662760991"/>
+        <Extent ymin="-33.94258732662760991" ymax="-33.94132830492694808" xmax="18.37821516684363488" xmin="18.37624285840067628"/>
         <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>
@@ -31480,92 +31490,92 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
+        <ComposerMapGrid showAnnotation="0" maximumIntervalWidth="100" rightAnnotationDisplay="3" leftFrameDivisions="0" leftAnnotationDisplay="3" gridFramePenThickness="0.5" bottomFrameDivisions="0" offsetX="0" unit="1" blendMode="0" intervalY="5" topAnnotationPosition="1" rightFrameDivisions="0" offsetY="0" bottomAnnotationDirection="0" rotatedAnnotationsMarginToCorner="0" gridFrameWidth="2" leftAnnotationPosition="1" gridStyle="0" annotationPrecision="3" gridFrameMargin="0" minimumIntervalWidth="50" rotatedTicksMarginToCorner="0" gridFramePenColor="0,0,0,255" annotationFormat="4" show="0" frameAnnotationDistance="1" frameFillColor1="255,255,255,255" intervalX="5" crossLength="3" gridFrameStyle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDisplay="3" name="Grid 1" rightAnnotationDirection="0" topAnnotationDirection="0" topFrameDivisions="0" position="3" gridFrameSideFlags="15" rotatedTicksEnabled="0" frameFillColor2="0,0,0,255" rotatedAnnotationsEnabled="0" bottomAnnotationPosition="1" leftAnnotationDirection="0" rotatedAnnotationsLengthMode="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" bottomAnnotationDisplay="3" rotatedTicksLengthMode="0" rightAnnotationPosition="1" rotatedTicksMinimumAngle="0">
           <lineStyle>
-            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="line" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{7f8bc30c-a977-4770-97ae-b052397815c8}" locked="0" pass="0" class="SimpleLine">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
                 <Option type="Map">
-                  <Option value="0" name="align_dash_pattern" type="QString"/>
-                  <Option value="square" name="capstyle" type="QString"/>
-                  <Option value="5;2" name="customdash" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="customdash_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="customdash_unit" type="QString"/>
-                  <Option value="0" name="dash_pattern_offset" type="QString"/>
-                  <Option value="3x:0,0,0,0,0,0" name="dash_pattern_offset_map_unit_scale" type="QString"/>
-                  <Option value="MM" name="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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="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="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <symbol alpha="1" name="" frame_rate="10" is_animated="0" type="marker" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
+                  <Option name="name" value="" type="QString"/>
                   <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
+                  <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" id="{490d72bf-21ae-4699-adef-94db3e5bc496}" locked="0" pass="0" class="SimpleMarker">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
                 <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>
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
               </layer>
@@ -31582,58 +31592,58 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
+          <text-style fontWordSpacing="0" capitalization="0" fontItalic="0" fontFamily="Myriad Pro" forcedItalic="0" fontSize="10" fontStrikeout="0" fontSizeUnit="Point" fontSizeMapUnitScale="3x:0,0,0,0,0,0" namedStyle="" fontUnderline="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" fontKerning="1" textOpacity="1" multilineHeight="1" allowHtml="0" multilineHeightUnit="Percentage" forcedBold="0" fontWeight="50" textColor="0,0,0,255" blendMode="0" fontLetterSpacing="0">
             <families/>
-            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
-            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
-            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
-              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
+            <text-buffer bufferBlendMode="0" bufferSize="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferNoFill="1" bufferDraw="0"/>
+            <text-mask maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskType="0" maskOpacity="1" maskJoinStyle="128" maskedSymbolLayers="" maskEnabled="0" maskSizeUnits="MM"/>
+            <background shapeFillColor="255,255,255,255" shapeBorderWidth="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeSizeUnit="MM" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeSizeType="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeBlendMode="0" shapeRadiiUnit="MM" shapeOffsetUnit="MM" shapeSizeY="0" shapeJoinStyle="64" shapeBorderColor="128,128,128,255" shapeRadiiY="0" shapeRotation="0" shapeRotationType="0" shapeOpacity="1" shapeSVGFile="" shapeOffsetY="0" shapeType="0" shapeOffsetX="0" shapeBorderWidthUnit="MM">
+              <symbol alpha="1" name="fillSymbol" frame_rate="10" is_animated="0" type="fill" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
+                    <Option name="name" value="" type="QString"/>
                     <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
+                    <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0" id="">
                   <Option type="Map">
-                    <Option value="3x:0,0,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>
                   <data_defined_properties>
                     <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
+                      <Option name="name" value="" type="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 shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
+            <shadow shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowRadius="1.5" shadowOffsetGlobal="1" shadowUnder="0" shadowOffsetAngle="135" shadowColor="0,0,0,255" shadowRadiusUnit="MM" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowBlendMode="6" shadowRadiusAlphaOnly="0" shadowDraw="0" shadowOffsetUnit="MM"/>
             <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>
@@ -31641,21 +31651,21 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
+        <AtlasMap margin="0.40000000000000002" atlasDriven="1" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
+        <atlasClippingSettings enabled="0" forceLabelsInside="0" clippingType="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
+        <itemClippingSettings clipSource="" enabled="0" forceLabelsInside="0" clippingType="0"/>
       </LayoutItem>
-      <LayoutMultiFrame url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" evaluateExpressions="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
+      <LayoutMultiFrame maxBreakDistance="10" url="" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }" resizeMode="0" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" evaluateExpressions="true" stylesheetEnabled="true" type="65648" contentMode="1" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" useSmartBreaks="true" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}">
         <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
-              <Option value="" name="name" type="QString"/>
+              <Option name="name" value="" type="QString"/>
               <Option name="properties"/>
-              <Option value="collection" name="type" type="QString"/>
+              <Option name="type" value="collection" type="QString"/>
             </Option>
           </dataDefinedProperties>
           <customproperties>
@@ -31665,38 +31675,38 @@ def my_form_open(dialog, layer, feature):
       </LayoutMultiFrame>
       <customproperties>
         <Option type="Map">
-          <Option value="png" name="atlasRasterFormat" type="QString"/>
-          <Option value="0" name="forceVector" type="int"/>
-          <Option value="true" name="imageAntialias" type="QString"/>
-          <Option value="0" name="imageCropMarginBottom" type="QString"/>
-          <Option value="0" name="imageCropMarginLeft" type="QString"/>
-          <Option value="0" name="imageCropMarginRight" type="QString"/>
-          <Option value="0" name="imageCropMarginTop" type="QString"/>
-          <Option value="false" name="imageCropToContents" type="QString"/>
-          <Option value="1" name="pdfAppendGeoreference" type="int"/>
-          <Option value="0" name="pdfCreateGeoPdf" type="int"/>
-          <Option value="0" name="pdfDisableRasterTiles" type="int"/>
-          <Option value="0" name="pdfExportGeoPdfFeatures" type="QString"/>
-          <Option value="" name="pdfExportThemes" type="QString"/>
-          <Option value="1" name="pdfIncludeMetadata" type="int"/>
-          <Option value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" name="pdfLayerOrder" type="QString"/>
-          <Option value="0" name="pdfLosslessImages" type="int"/>
-          <Option value="0" name="pdfOgcBestPracticeFormat" type="int"/>
-          <Option value="1" name="pdfSimplify" type="int"/>
-          <Option value="0" name="pdfTextFormat" type="int"/>
-          <Option value="true" name="rasterize" type="QString"/>
-          <Option value="true" name="singleFile" type="bool"/>
+          <Option name="atlasRasterFormat" value="png" type="QString"/>
+          <Option name="forceVector" value="0" type="int"/>
+          <Option name="imageAntialias" value="true" type="QString"/>
+          <Option name="imageCropMarginBottom" value="0" type="QString"/>
+          <Option name="imageCropMarginLeft" value="0" type="QString"/>
+          <Option name="imageCropMarginRight" value="0" type="QString"/>
+          <Option name="imageCropMarginTop" value="0" type="QString"/>
+          <Option name="imageCropToContents" value="false" type="QString"/>
+          <Option name="pdfAppendGeoreference" value="1" type="int"/>
+          <Option name="pdfCreateGeoPdf" value="0" type="int"/>
+          <Option name="pdfDisableRasterTiles" value="0" type="int"/>
+          <Option name="pdfExportGeoPdfFeatures" value="0" type="QString"/>
+          <Option name="pdfExportThemes" value="" type="QString"/>
+          <Option name="pdfIncludeMetadata" value="1" type="int"/>
+          <Option name="pdfLayerOrder" value="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b~~~extra_security20170921130834191~~~complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8~~~marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51~~~fencing_70522fe0_a771_4170_98b2_d5843f62a7ab~~~fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb~~~all_routes_5833accf_77da_42ef_a24a_197208cd2190~~~timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f~~~water_tables20170921142016467~~~poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f~~~directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4~~~mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea~~~viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0~~~vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea~~~golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d~~~residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec~~~residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e~~~osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18~~~osm_places_69db09d8_86df_4913_820d_b57b32cc332d~~~data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12~~~start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe~~~capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1~~~GDAL_City_of_Cape_Town_2015_Aerial20160928085834970~~~Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d~~~cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a~~~cone_groups_a294cfec_698f_4117_9483_173a4f6655d2~~~route_markers_022f7471_3d57_403e_b836_6019bd5d0709~~~route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" type="QString"/>
+          <Option name="pdfLosslessImages" value="0" type="int"/>
+          <Option name="pdfOgcBestPracticeFormat" value="0" type="int"/>
+          <Option name="pdfSimplify" value="1" type="int"/>
+          <Option name="pdfTextFormat" value="0" type="int"/>
+          <Option name="rasterize" value="true" type="QString"/>
+          <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="fence_groups" hideCoverage="1" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filterFeatures="0" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerName="fence_groups" coverageLayerProvider="virtual" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" hideCoverage="1" filterFeatures="0" enabled="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" sortKey="&quot;group&quot;" filenamePattern="'output_'||@atlas_featurenumber" sortFeatures="1" sortAscending="1"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
   <Sensors/>
-  <ProjectViewSettings rotation="0" UseProjectScales="0">
+  <ProjectViewSettings UseProjectScales="0" rotation="0">
     <Scales/>
-    <DefaultViewExtent xmax="18.3966948564276187" xmin="18.39365183857621489" ymax="-33.90669064043363079" ymin="-33.90828503601445476">
+    <DefaultViewExtent ymin="-33.91538578232235324" ymax="-33.91274279235879163" xmax="18.38992208775345105" xmin="18.38487775262299451">
       <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>
@@ -31710,10 +31720,10 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
+  <ProjectStyleSettings DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1" projectStyleId="attachment:///QnVUUv_styles.db">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings timeStep="1" cumulativeTemporalRange="0" timeStepUnit="h" frameRate="1"/>
+  <ProjectTimeSettings frameRate="1" timeStepUnit="h" cumulativeTemporalRange="0" timeStep="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
@@ -31723,27 +31733,27 @@ def my_form_open(dialog, layer, feature):
     <BearingFormat id="bearing">
       <Option type="Map">
         <Option name="decimal_separator" type="invalid"/>
-        <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 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" type="invalid"/>
       </Option>
     </BearingFormat>
     <GeographicCoordinateFormat id="geographiccoordinate">
       <Option type="Map">
-        <Option value="DecimalDegrees" name="angle_format" type="QString"/>
+        <Option name="angle_format" value="DecimalDegrees" type="QString"/>
         <Option name="decimal_separator" type="invalid"/>
-        <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 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" type="invalid"/>
       </Option>
     </GeographicCoordinateFormat>
@@ -31761,7 +31771,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationLayerProvider="memory" destinationLayerSource="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,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=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={431ef746-5362-4d7c-bf35-560ac1fcdbbf}" destinationLayer="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" autoAddTrackVertices="0" destinationFollowsActiveLayer="1" autoCommitFeatures="0" destinationLayerName="route_markers">
+  <ProjectGpsSettings autoAddTrackVertices="0" destinationLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" destinationFollowsActiveLayer="1" destinationLayerProvider="ogr" autoCommitFeatures="0" destinationLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" destinationLayerName="marshal_positions">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/marshal_positions.dbf b/GIS Base Map/marshal_positions.dbf
index 0be2cb968150fde2a7763a09958efdbf8965e8f2..28211e450bd1d7af71f97d26aaea6e7a1d32a645 100644
GIT binary patch
delta 410
zcmX|-u}cDR9L4$Fb%Pyw9_UH7B+=5+c^=nIks(M!btgngnu(~iB|>Cc(7)gtswHf)
zM*TsXP(u_!mxgOmb5m<mmwJAe_xSLAUmoAzHv4_Ua%{!r7Mk3$8=n(#T)2HT5<^np
zYeIGCU<p1L-Wb~aI8{9wp<PjDu_#%z<YyT~0|i>1dYyr^WYJdS%grgWtSb1~OJI7<
zg^bz3dE8<b!a7c~TbTEbw>B;b<u>gr{I*3K$tHnOF>t-(@2ij==t0^)=-|Tp$kOO8
z$KWJeKp<D3xA|2O-9wAj6dhtJ0lC7{-qG7EtH~kUudKs3^U~5)Z;bjHOpuh&e9Y0~
zr>cbd1J5WSyQYEQheT}G$rBYBmx1oHkAzXYGl=r<nQ#b2t&dSJ#|KDpHW5h<kq#m|
fVe`cat1>eC1FXW6GW&5=wSVD2anj`HMicl0E;pEy

delta 718
zcmY+B%WD%+6vmm%qf7=9LldJ}NQxl3^1kNIOj?juaZ|OL#yTUS#u{l%eH26y3dKJ_
zusxs@MC?v?mAetKP+g0iAc8LI)`hxtqi4nh&1~j;=gyq_o!|HEh5l<pH}#7{l>;x$
ziJW=4HGlIi6mCtx<_-r|bEW?}=kv}=esQn?AMzzwZybX+j-$j*sTqtD3EJ(Znk&?F
zgL3M@!f*&1PS$i8r~W_1ISu*>){0w(<cz0{rH-v`l*|kc;}pivHLa@ToU^2ag>u_)
zITyV?9=J)VK9{@u3@N05?L8s<_V7MWNZwcQd~{1Au=%kLmuka?q(Z>yBN4>4thzJy
zHD}Qv5QO6AO%+ahn$87*`?C=|tJv`1c$~N+eRn1!9{2J85Dpcy79&0<EZG{%fa8<|
zz`GMqH3L`TuxvHeg(<|r1aXraEau|)ASvNdJw{(6aUH6SqE5Ml<%1!tU(2d1(@I0Q
zb!eYSAlD)8y}g;iTx@tUQyvJ$R{B}wCk10EfT_u>>3IVACU8>a3-%WkDj1693?e8=
zj}Py)E#^~!L8e}PwCyD&T#wor!Qt(El<aLX-$e@BV<`oL`AB;_h~UR5M}3M;77W5M
z4NN~TtGx&F<kC$s?(Tfi1!mgKN3hg!beH+?GZVqXhONGLM)w;oV-(Sa8dKGkqo(c!
f6xQy|>cS@wuU=KH$J&TC4c*r*_5Ri3F0Jwhngrz;

diff --git a/GIS Base Map/marshal_positions.shp b/GIS Base Map/marshal_positions.shp
index bc5a6b013b656dab43780973372d6a59331caeb0..f912268f60a8e7e5da369ae17a270f15c992948f 100644
GIT binary patch
literal 14856
zcmZwOXE@gH+W>Gk3K5Z!hBC`2qY_aWp+qSop<#p~R8$frTS}8esVGH>iV#JFva*s;
z(NLjbWu%_-cHZajIsV5{FM84EIIr)u?rX=!Hg^)+KmW|){LI0|#sEvG^_?xSO-;vn
z$3!8k5uL)}Bhxn<x~u6}P0w$Z>C-9vXZZjABQu#v%)bga-`xy#Rnsv~+B<pzW7)|<
z1{-anz)Cw;PK-i>9AMlrz8uXnU}e8u^I376WCN-{(vE>`F;en9jd2smnySu5$AFdS
z>L#5;n@A>cMmjbc?2t>V{aG|Fvg|jhr_Y1kwCpcnrO8b;C86)tX|O5ZeVt-3j)zQa
z<V1Zu*pf``dRCgu`W-L3L~w$~IWQiZ3AyJnj+d-!@6_pGE^0bmxiPmj(fG*TH;S)0
z1aZ$ViFGNWO(q-c6!-H3JL9<Pvm6>f*$lxF(?GC2hEFCdp$U*(c{4#tc&D1qwBw=P
z2hgUF9sX0*e07JKPNv*?TXQr)GR*?ZI7hJGjZ5=Y(S*osQ)+hYcT>|z^kcle-#^|j
zrjo7In4WVKtZtK><^wcgvUK%<m50F$KeT4E;zY>eeKLfvg7vg*HLJupQL@g?I~f<j
z(p0OJYSF~V!c^s)^q`M=JPkJei#Cmn`mgfEJsa2t#`7sowk7S$GXsbVx-hGQ9c?<9
zNRP?OUihBwy=R*IXfwz*%HQ5J0W8qAeN!2JZzfsJ)W3<@P}jB%H@>pUFpJFJTVqBZ
z*u6b7*{d;5g6#Zix1(NQ6J*6*lF(+839|`)`VH;S&%W~1ZnQaMPmW!8Ob46sS>9qj
znk3nnNK#@NSm1}!{pM&=WV3}d^8&zLua)W4N0TONxpO*J5$r(Wz2h=yGGt>4+4_=T
z4>UG%%c04V{SuUzrVqB_^N@rhnjD$y#>(wdP-hDcYs9=qn@e`@S@od_&T2Z^($lP$
zpv@ywkVt=#vRzH*m$0?uOf-2i?=P0;6TzArRq7?s6vz^zHgPb`=hW>j)6o>ke5*6<
z{K0}kHlCG2QzB#NY<1ZT_Qvs6&s?<mWJ-3~{j0!w)EUp_qb(ropTpOy5BB4r)yV~D
z%49ZQofggn8>_T*P)AcCGrCZ8vdjs}_asGaGny*ddt0I9zrh?=Sm>=nQzO$fdB)}m
zR&RWLh6mb0ve!8^Q)I#V_N`lc7;O<*n1igLBv{Vx;lU$li^*1vHiUn6RMY7$yxJIp
zrcM^ds}ge^%%E$a{0`a@GKEa#>#1OuOD^BJjix~+d^r5xQD&OgS7leBX_DnmjGAf#
zwsewVX&2g3vU16eZgsG@S#0Nd@%N`i#%De9R0-_H!9(19Xxd~hMh=bqV5J*2_{>6E
zMpk6~bejm6S;;kS1+?X4Uar4~CxL~|I&(-7Z3WpkyJXH02Q{6a`%bB7qv??Cl0I$8
z332?lRHW9S>5{d{hCTcRaog-nyG+sa$U65LmwW=tmV52uhNe$8W@%XV6)c}&`oj}#
zC0UdE7sn1T!|9Uo9%u$+v&QuKi@>ZKG+qRu8ImngYh7Fj*8KUi^HDS-vY>4%WAeew
ztUBaQp{*hdd#dN}2j(BO*Y7IYYO*W!zF&`kWeG`ZT|+Y_tM*OQItVt$=Uw@Av^8Wd
zy|TKdV3Um;vTmT6kexi3(;o+x(VBlP7tNIHSJ>_R6tK&a9Tz@CTTAAf$~{`g{NDG>
zmRhuRWGBO3mS%wk>0e3fMl&NDYx}?#19oMbP3&*9^<=?9t}}eWo+S$iOc@-XJ2sGI
zlzJTuV}5VN2XTHhbF!bW4|Ht>(=s?~HwVpvOuyo(jssX0`}>9S&@9Q+?TenQ1uN)H
zP+Wj!MP@f~#f9}?A$mLw3(+=`t#F+CbOl(jm9V`Inl)LzO{LWWFbx}*Erw{D$k?WY
zy37Sz>c?|x1DXw)MuV;IWUzLJym&h_Te6~})9t)qwgVPAPH1*y`o6<*!}e-AP5i=t
zcA#x0i+-|8_7_;U)K%R*Xj{ni%U%UlfbH2k@nR6#R<bo?B_HpBd9E9(K8LoAOmD}$
zK3_0~zp(T*G<&jHr<a#ng86DW%iTwFAUn$@IdKM9R-Ac7E1Dx&{0ZmBVqpC;ea7u*
zPGoOSn!9zw`q*F|=Y_9m+sWK44pk(82_$s~_M$nHeac#^at`c;Oo_oSG#4@+CpMuy
zU@xuro}2n>yq~#}eSXb*Vjoyly3e3E+72@Akd94z!M@FU>mZG`lkB#?>oGwn!wSu;
z8#~b4$Yl0C2p0hxJHxYc7n(cSrMji_1i*@_=HBo{+eLO)rKoETSgV%v%s4a;vf;K?
zElIFBf1^|4(LBklv&?5O>+{;rQ0>cTUSu^Vt~N-49rhIztw!5Tc6i?wH&w8q)-!>v
zXnV+F`82)Nz=|hHpXor`OV+VCm`xTe>d+sVUufQBBUKj-Mxf5(_c`Z_4vp8f51D`9
zme_V?JCwaFl|kD_mhIG2*#_oRQCqSEZ9my7x5=e_U~k+l`3=wxkTIkdE@ePo;_A6W
zP0@VGB<;#|n0;x$yGzju?I2l2yI*%R*xbJJdu-AC$bu}c2$g{C8wyHyK|4hD_e$CJ
z9I$se!N)z&{K=;2jVw+FlZmi?=!X_S#-`%bbsg+TK<DW&w8La0$JYz_gI!ekCUy$#
z2-(`91RXE1UqTa}$Dsw1HCWmo_5^clsF%Kpc9iV3f1c!Su%C{eb$Mt(WI3MAH9lZx
z11+UW(1OYSoX9VV06UlZrK$=oge)d<gUuzdl<A^8FVRBDTJFu2O$M9Ddua4ES{Ru|
z$A-aFFwg78o&#v%WbYg%b=(HKHfz{?6fJ`6LDQv8ufUw8xces$kN2fWvMS!*%r{_j
zq)Q?M(T<Tl8#N4Q0Q>ncH%$O7ifsSIn}N)B*n3lP&m#QZak6Pr7H?C)4(sYjNuiw}
z3sd&lUJT~Az}I{#S~S@yp~tZ`V4Rg#TPL8MB)c@+rCSdcFc@-v41X)9$Z~CKw3*hj
zdZR!e+Ufsn2S+)xfAZXIa$x=b&XCpCUflZ@%zlpTSPsUWB|GXhm|Fq1btpnL8SNa|
zwS931i@-8R&)9pT#gOsNsZVA0-SDrCa_(rcWE&=#U1j#qf#~{6c4+6xIvfUmGy9o5
z$1C|wXmMmp!BZx!1QQ8yxMqlUf$XT<RvTR~Zhmn-4YYVNK@E?@#bAj%CvD`=6380L
zhOOkm-2GQoi=tg5^KEf=PzJMTkarozIp7i*ox5DgyfXF{Es@M_XQjnLh*N&HD4+`M
zGMNa!-7E{R$0f7eD$%Zx1z&nG%Lz<(Y;}4C+Eubx&D0YfV3X}n7_uyhOwUefLKs-g
zn-3q$F)o>G=ki{$M6lqS_k2sxu8~#VF|@w}c5T}!l|r=ZWL~CA(z3v$h8}(@KuaO>
z+fu!Z+3v#y$ssvtH^|;}v`c>j`>>nsRWjO5vdf}*vSVP~rE1sX(Nf7CFl?4_z_>f8
zy)yAES{m6C$sm2EMJ5DfM5Emz%MysV&JK2&qhBK!?Kas)1HYj0u{_G&+#fCdKN~n2
z#RhRTHyfXNqun8Uw03SQ(-NImN3qsD8Dx7p_{^AT=Jec~xEtd#$$XEGw%vg8i7fuu
zXo+^0Y=(N1SQ=Qs(%293X!pp3J8lQu2YV^D;UW*(eX=*<oMOzpc&C+39KiK%7TMeV
z0(Y5f=($f@92(KG$(p_fZkh{mvZDQ3@6jHR6=W#8Uj?gqcV4UnEr-nbj!oVpFgwQn
z#i?kyWS5k8I(`GYn;g6AB3d5VEWgF;3?VNIUm2;h_6QHj`r9V6%YY53C$3GxxO}qD
zYCf;B!E7#DO*)8HK(;)!?R+ro)pkf<>Z`#0<|DFc$`W$kurDso9qo5VdrW3^&0VV)
z%-UcB`&P6<GG$jYEp9lwkiKtugmrdNL?(VE&ASBl{WU?UN0(vT6S4)K++wm2_vmyj
zXDptr6_X8gjb%*%8;mVmo`F_Eb|BQ!yb99vy_K4-g=sz|Q@eFU^F5p^mTG!b%cGT&
z-6{HOS@*wrDI?Qc>lb4H-@9Ddv&9>~S59_t`TFp1IG1{{+{p6^+B34Unwz(o7J9;>
z;~Ls?G7|}|EOR&u`m^2U00Z+<LFQdP@zh4JyEZl>EUP3NQivAjhdwb`u}Oaj+pmhO
zGqx!6CiH9V$!{)i!+u>&7J4IPUN4j{a;}|T59XzYtWH;J;18UQituuEs9;`Rkf|5G
zo3R?srA9L6w@t<G)sj6d)(H;<d-r+L8Dq3MGOK%+E8W2g2aG%9(CW#eH+FJu0W;S(
zZI(xCAluOp&}<I2M!mOF5Ur6cutqU&4Du=5w^M2{=JO>P4@b#0HK;S2DQo7l&eod9
z)(dbw$cMPjN2d?4+Wi%oT8&GUDzuT$$8Vxxm}WCs-Ffae%3zMQIY-0MUX$%r+HH3U
zen+c&R3!^ApDkpUuiX&41?DR+-<glrO4gPUBajTH-R8R`2d#~4QkVW4=J~|opbm*>
zv^Qjnl=|cyp$}>prR6Tdyu2mbP`+w(E11+z%O@;*M`oX2s(KCjMBDC%a}9BA(@r+I
zH@NjAn7WeNCNs1SGR2yn_RV0s6hCb~fcBoO@L6T?G_Z+AZ*E4ReIRRD?eSh1?D^#8
z;L~Uy$?Uz{B*nq>M7G!_p?xA#QOYV?0Jc9tVRJEBC)sJmZXQFhTBDnTO=zFV($|R`
zF$TMKOjfQ1?F(67rQIegu&8s9#T{s0$@ax8U2O~I@zx~eBU%^P$MR{)&S3oe2ETQo
zb(1O7b<}u+<+?7f>qF}yYm?SX2nI{svB8?P7XC&ivsu)Zx%O7E9x9uFYufK*`JaW7
zGr-1<Xjt;1{UF=$A}l5k>|4wEcGepDCs_?o;@L_tt#|A931M6>nbZ~$*9Nc=|8}0K
zXnkbDp6zeym}$N*(GW)KCu_P?^LQqVFWo$!H`L%5GC(#h%l0F4{o-+A-mLFvgJj%C
zwN5bCk@GYo{>;L4-7m5sHZPx3U<OGMNh{EX$O1~=xyFIbP~XPB5^b0)IqA&G0k8py
zA_E7s5wb-u6BC3WpEjo7>yyw%$$s+1E@iH-xwaSYnu~4pn{10xZ0rPx%XZ)VbT!%-
z*-6_OTFiY;>$HW<!DxTTx{L=@qQE$-7U&&E`%CuW<)J?2o@A5Wg#*~n7(jT><>$|c
zV2;T}^HcYK8;@f!ar_R<RNg!H7|gduD$aHn#(&ccb}~POBWF6m(%FZyW6?OsB!3hO
zX~KMa|6$&rO=z5CB77Ws)4(QhzO31ZHi673r!c1$to6_z1yi(%WTiPSOP0X=z_Gpl
z2rn8JnUG{^P9s=T*`~AHXxwChzZ)dKfTdOFDt;TER~S71S$9>70F1lgyc?&?!?;Og
z-<8~dJ_CFAm|si*jhF11#Xhkxm;<C+<M>yNkAn<8vMz=G4X$9@MMabFJee_>>|AGb
z$V#v$qfG@?7{^cMSKDi-3wB}Ek|~yG0%W<?hQY>Q#c2-@S)ffJJGlR=x(t}KqGjYF
zG(oa$A}6NL23v67S#=?r5Lx&9x=}u`rQ&6d5@=J&KDhKm4#K?hH(S{P&+Zw*WQJUY
zKW9LkiM!C1`4}fcCcMM<_%yKF#YZKS&_v0eFU{)_2J4*g=#4Cz7+HSSnA;REzDTE)
zGHBDt=2-_{Z-=}*oEM|=1KUBIjQ8~Fx;C)a`@V{QLz_-k+tOB7049(%ldTbL2ANRd
z#f$gAyoN^9@g9#clPp*Js(21q7^Cs~GmM)>#u>Vl`xIE0Q<4kbeKI7-<oP!oDS`eX
z;Jhji=WxbsvbaUR-NoRZ()?YID62l_km(5aiZbsT&*-lU{*1prNizTVFD;p1S|?Xc
z=|+<xOa78_*A?vWz2`xAKEaSCbCi21%DfZi)-OFGHa>nbWXMXyj0KiKUe3=BO5%n0
z0q|--mQ2emsY(;tf!+>)$&vBhjUUy5@8$Abj#I|Cxnvd*fB!y(-<TjnCh<4sa~|2u
zKE+Q?F!%clj8%O>lP7EUjclC`aTgMAo2Q~FkZFG56`Tl`=)J8k7EO^X@M1#9FpLv#
z&9jWpqA8JaTke0?_rEru>_=wxFbAaR*sfdajByLdnipwrXMXQ{ld~}H-x<neF3*x5
zj)Do?AC&9B{;5LtYFga=zhDk7g2(&ORLNG!N}1V0pJ0;@i_=3>Ba8Uld8`&J=r#A9
z*=P&Nv`ZAtxuN|69)}-h_3K4spOx1;nnGOb*ltc%zg|q1wyY-f3hW=w?pkj30Q;^w
zS;t=G!ep?qIa;4n(3X%5hA`wWfSvFujfg_iAY1js>|Hq6kd4VPRW!~2%t!1_5Lj}E
z{B~uurDTPPdAx_fl=hyyrG%zMChFq9H3F>eVFrz@+GL-+78ySQ^C^(gV#l~;WJ^kS
zN<9MedfoE}_Z^JoWL}FZ))azGS$}^s2ga=+`zmZM^%QKdak>-BbjS*d*CvE8)0Frw
zx)kRJU9w+g8HInLu8rOs#4f-z^~j#=E;pBgHWFG{{TA<_8Tw>7H%-=wgNala<O*Zl
zO0vlzysnXuW~S$$0KSc37?2H#`*|_nxMVskH9C%YF(hl|&Ar2Xi?dj$DCHQM5m{}i
z^bzKp8m;r}#gS;M$hM>h83luB2SlnypsgmWyOs7W0!%TdF+Uv5m@NF>o}eJGSMF;z
zg`%w?`>;ldCmbwf)xbKInULvZiRm%pJ|3u!4#qfBvZQy_X<=X<jnB8UY%Q6cX)sq2
z*!}Ak{h1iIj%-b&+D+!08t-Bg$GvD~WGTO{ye^0K>rr-z4MJN_R?sYW^$5gyiEilD
zM%zHPe1?A?GcWSXD?cwsGbfw2JUr$wSa|M89lph3SdeLRU#(=m(`kO0aaRH3EXh(F
zxYsnpSYTQs<I9EZZbi0vN6lO2{yl!1|0R}fB-?v)mv%LbS*GSi(^=~tYcd@f7mgY*
z=lhXiYcb7DWDAwfz08F)RUC#K1<-8B=BHL$3&FVSvB1$E&mb7KWHZ}}Erg*A&cC|L
z+OZ6FWKVn8CjWpm^FlL5S?i_EWUC$Bntp;E<EWGD!?-PEgNC{$zrm*F_y1)5Znu&}
zw7pn30yZad>huYi&uwJdGdIUNLq4z8PQSYy)3hgRFwn8S19Q&9VL1^z*Jn78Wi<Y-
zxCrgOB4l<5Yi;UC)^SF2m>(=~jn!Q|FJL&4jlA`+jRVtCw}@qpXWPkm*Qb<kgS^Cl
zwSM~v=LcspOI|ZYE-1qnp0gkDo`m5-Hdvn*`WM>hWL!!#Yp!x7>vwUp*bH^e5R-9!
zjAh?J=2`VLhxuD+$*JyNfo0!GmKz$wSO=D-m8ks=^WsKks&UvzAI$uT#t>`G;7%qf
ztJ9wf<;zOGbw?cM{#|5-?lXK$p+33Y@`sAiJjmw8Ii)k#J(}ts7d_ED$yAJPguVvr
z{FTV=f#yYa;kik27OWWpXYZAEMcYj_aE05h7VOrdn3X<gd&mOvBj4WwD{{Agz{<;B
zGW~r{8wa6$+3Z{g#;{(z$zFG!)?mJE3Xxk^{vFMStn54E>_LcAy?u!b-`6qrk@Y5r
zo&5^!_iB5xC#zrYCtDX)kjH$ZG$IirISt$B09ir$mBg!Hf+3vx;%L5P#dGKOUS{@*
zHL@Q>(GHT0=I>j#5-g;7!70}M!H=xnR)KRFGw#Je6P^Vz4v{GfCR}v|n;|y;Icr|=
zCtFdIE#m+-r{wAieAmSYAlvp~b`3jNf#vXaJXd5KChK069m@l@xLc=eDdzJCSx?2`
zm{I7v&+e%{*F_5?`yFv%+5p(cQW5)=Xh+EktP5LOz&Jb3d}WPUL1cOC;?b|b&IfQz
zUx#tQWZ&j`-DjS~wye6X!rB{#kO>&fh<*fSQM}RC7UM$6G{xED&w}-=im$gv3nO#$
z{}X!>tY$~bRtL0jvdf*vPkVv2B@cD%K#L&b$Ow&c1#5le<?V(RNtR=s8MY2=D)*cq
zPqbrXy$t>PhG2Zr7gX>)A0vvaluuD=HkeVtZ!>?4J5FZeHz8IW>{FDqAinEjoFIF?
zq$`-YpWfNhJ9q};qRCu)A4ar-t@z<*g73N*C&?nbgOA+<OJVy|b`|4JkrirZ%x1p%
zN`I0$l!kViO#ZG!bRt-Z-ubk2v@>K&o>|5DfjPd?TEp4{oh37Cx0`qXjQ?|^6TXjR
zoFki8mC9!ccCC5On+{AfhOF6BZ;~~b*WE_*PPAAulNAY07GMGi-q*gOohK`BnQF8U
ztcvU64lZ0L$C0IUDxFmU`(5vQiwErjnW(}{Zb7hDoD$}&J!L$Zw(G2AlfiV0>n_j3
zxCF8$CADwNw_+)N{XbZH`-^1vL(TRMf%&BlG?`%BC9)IQPXd|m!P?^GC3m7Fl07Y3
z)c+oArq=!|yU;F^g)U4mdIY8#zu{>l+7+_dy1!mB??Mb0XY$~AE8{AeQHcuM0We{M
zLyzzdg^@(o=f#)m0misKnuPDV7|CQavM#qW-za@PKA?URzjuwy@5h243Sj5f%}q!_
zyH3VE_HZT#*i>C*gUe_sWUBS8yv#R4z7hc=iD);-3Nqrm%D|@jy0_yyGR93Zi{4Kc
zi^1Z5CkV3gl1k=QTF!n4ET%XALJ_8!M&|m_VP`5>u(|e;VzgUiL3ZMscY)2x6RdAQ
zyG>T-r4_gpEO*L1omXh-WP(ZZsY+n2y%Mz_(C(0#lwIFF2;=A1N0FOf<D8R0HZ(hI
z2Pdo<@{ca;c#f7yW}Fh=!Mq2m@wt=ETGQSon|H=gMh0y3z9cWcFK65%D|6WOfqA#I
zSM}%XbC~9RvY&P-CPrXU;R(xGYvC-iuth36UBPB?&n#rErLxK9a&A=E33e{HE7}p$
zd_X3={iT3A*zh?8S7)>wvSA_9qv2rlt&9KQ-4Y|0O#R|YqhK((x65wr!?-*$W%r+-
zTEUVvtruQJdq}4G?fUR^Sfe!L)@MIK%O}fje&8t$Hg%Kal2Wt+GKT7LZ*8!`$f|}~
zv`1v?J8mX1-%+o>VRxVt?J=3~wcHiMur64YZlm!Bt&q%VNxgvr#LcnFZ~1{%M5egp
zgt8ud@Bjbr1mg+W>Z~r_i%>q5+6lGB7*|Y|QhW3evyF0ie@N+}m5@D{>i6Xn^rhg?
zhSXbVPsuK=d}uQOw!n7i!X~s*vVzR{SD1H^w||7MX+bOd&&tylEdujiGRKDx$Io&y
z4qbiU4489{+HtM7MteqPe<)(LEsTR3W!JXXpgkw+R+TKxf!}+UhUiJWhh<cdUCxrQ
zW4=Z8>EQnsh`*IevK)p;_hT@TyNlC<(5lED#@hu*f}Oc}>M6cOWmJ=Ct6iSSd}HQa
zou>5#<7&u^qK<J*2b(NwdK2G&GG36~YBFWx1Y0u{Y0`&rwPYXe*R1;kXWK`X^|Z6B
zj;vj6`m#bWF^%C=uJOA9Mm<?z?uf(#u>1?N*5Um-qk+skxoM1fUhdAJrX-7TjbxoM
zs~fVx<PSVsu>$QS*?i}h<>T*=OsCf4TL4BAS;2yYdCa!}p4wNoS!3KQvf>uOOSiyI
z7&}VZqcxLt<z@VifOWY_g~{n8>=Uoak{%p<!?g5yX5X))wUF_jv|`%|HpO1LEE}zr
z%;~(Vm=#!^U~*#~S{vEN#48^}z=i@R->F1<Lssv>-ZcrVrPNQp2JJ0bm50tQ=36T3
z$-4qLunh0Wo;bDpAA`6Yt01Es?1SxO9wmy?c7hddk8-|_)<O2n?8mJIU@MDF8jqp9
zC(Fq&dou#RX=%Z-wLWMc$n2tbkKF-_;TA8kK>J9hwBu4{0E`nh{Lz-IvGo&~dBdS-
zAFw4{>TuPmQwV3Hon-3|9T#HW-)^-Z3}=n=pULvxv?n|UYkf5Q@jk|VA#>B1u4V;!
znQ$ka!5Wvol8MZ#d&LHES<A<ar(!<4$iyb@96u`w-B4LE39Xxqaj)V57o<77>6p(%
zv>q}WIUBA{NK?u};Th|`;~Uwq6OX+C#HHT+yA|I-Fus$W329u+32`x(-doSWG=Gr&
zqh5ZJ{i9xb$^KC<ePsWrmwvK;)XM<bKk8+W>>u^=i|iluGDP-|dKo7BN4<=YiENq|
za~tY&bKLT8vvKb`N_Jq$*#i^64%?ji!$A8@Hs~hum^oLy)996A*%+DEu)6bouxXp4
zIs5TU;15})vw(Rb%vBX~O+n|ejsB7iC`u%s2g{N4X~%a0>_B+OHzO&+E$V-bLH2s*
zuZA=*QRAv6JQrqX29Dni+Hpv@KL^_!E;@u~dF&iyMhUK`e?a-lPY-O77%v|?Ct3HL
zA8I^con`?ec>cmZfz1DjtPumw1eRAMzAPCp1N%fW{)WI%Hn6zrgiYmWTx2!Ii;nJr
zda-mKEW~{=J2zR07yDTcu(9xUbu8l{TV(e@wHoHli?$KMcqYd_iR_c%>jE~g<{j2%
zhWI^RvLXAu5}aTzN`k()pJwMHyPj!n!rWVM$dudST@U+YGBZ)`-ZB^mV*~58PmSLR
kv-6W}uN(4y4i>NSAwLRDfXpkMhg%fpxNg&viosz22S9=yF#rGn

literal 15156
zcmZwO2RK*X{{V0w6tc2Ol$}vVC89DyOUp=T7@-Iim86m_rAb90N+?kgqKIfoRuU>2
zlr*eJ>i_<Df8O7Jzvs#G=($g?`#$&FbI(2ZENpBl6WIRwBXhQkgN=;=mRK7wMR22z
zk=y3+!nQw+N{0_jT4(O1V`Mw2xLL8!sPv!V|NEcJWF|2GDdBvR5$>U5WR<#O<Os&H
zlZ6d7+Q)!Zb}k$rg9bUkxI=se`X|7uet8tL;yB3$w7+E?0$XpP5pW#i#*sBupNx$I
zt1vcBJ&HD-O!kCAd@R^r_g1HqXk29ZuQHFH2FtMNFJYz0O*S#H@5OPjiC+U;<1mhg
zOycK}`UJ2!xrX(uG@0c)cJH#GiQcEcc<jd&p2j#{vhE!slOo)8jJgZsuIi)lk-cq{
zTDlkF9-WuyR!8F}8|;({3<Nvjvb9SYO@K^VsKPQBY`ghAehoB1vXocjG(@-P7)c%u
z_uGv&k!=6(>gEfZb&PVAS2<Xr36bfS*qm_z`_(wNSQ|~4%ptvI>n=|nqohE_>zn;!
z^+JSfx!$CLgJ5-QmGy6-iIQdO4lLXcX8x`<pA{!Ymf)WwdI7AbZNthZ7$;8F*?BGJ
z99Wk2Q;k|Q39<-nWmglZqu%#JE&rfNl2QHDJhy!{+rU^prO4K2eSByJaUo}AI@r-B
zk%{#zd)^DzGrsXqUjR*-Y>n#Gwd25o9opAc;q@ky6^Q&v%7?OcXt?}|bq_LRL4JDD
zMPN6!PiB9Lak6Bm7keJ`1skU%<(`T*g-n!9=)*5~4*l#4k8MMnN_OwiC6{b4=`L04
zRcLZ#qhhH^Szy8MDtB3-$&*bH)-T!z_Hwymrzx5OS<AKK@#<i^OK%)jL{lUiRm(S(
z1G}ZShFcj;iR_1vtfVQ}g03N1bu?u%k2Oy=$wQgV*smA&7EOih#>1z3$GPbk87fHH
z%|V++rY4*HEPa!X(GO8Oxyfj%WPTrQPA7piH)_?(qN#x~+Zg7LI{c2ki%BtSIhg19
zAG^AK5}v0)7VtFJF$gRqY|Tk|wCQ9FqYdusz+Smr=}|$OL8jrD-@gc~N0;$%I+`X~
z|5UzSQ?PG)Y>&=B(;~C~<T`UQ*ys}*XI(UHGK;fiN2^@nUhk#rtV7cwd+Q)P{}-6c
z0&9~+Xfwg+UT6JvJo~R>U5eLV_K?j7;_H`OlJ>^<Ib<&jY9=ay_3d1-d_S7rUuo#m
zc@fS^=5lae!LQ-L19;wCvPB~ekzFo2MxRSBG{&JBkVWun#a#k3>mGP;4b6~DEm!kW
zCRlPs^0ljI^T<T^N8UKdO!LyB{A#rMV06z5{yH|In8NWfBK8n7cY=9kH^vzMb)Lyz
z$EFnXK(6DnF2tOXVLQ!>@A^VAKD(dyHNY<K*~`s`W=7_2;oK+yR=Ik$zYLl=S()Aa
zjbdOcD=u=Yp;?gmdi)xm02VHDVy`;dBC;=zX`DZub&S66Jf>xcwwP?I!f_i;h!eP?
zCBFh~30a#`#O)stx6#qE+Y)UlS?7)=6(7Lzm0!AhqAepEwK1>y1Xj$j{N{sZN!H}`
z(WL{-e3D#(H`;PCnNd@LGBCRay=Nh4E6C>Pw9YOCYwqfDJBYTDEM()txMHxCwjIjH
z&{mN}+&2jd1PhAU5qJS@HCal1z^4OXdBO??7tyT9o(3ct>;aqV|K`CZG;1>VUL|8o
zFn$Z?yvt}dWJmWD^q&FCX)V53h-ORnBjRdtI#@El%gozoYsdmJxku`l*ZZ2=Qj2Cs
zb~NI7Wgb|FX-d{-w6$cTZSVNvz*08a$NxgJCkqw!kPZNQm?kJVad7NA<v^BG>ANR_
zdA$Yiqy*3$$-ckb-Ms<K!0e>sRJ3(urjPF%IfLb~znwV^Z9SQ;Q`x=cU?shY>NC(b
zkU5TDaCQ|~m<dnAOtg(;3tUw0F8~X*6?HN~b0RCYe_}fWOwZnZy*ZjQ8Qa8gcNMU?
zfjq}nqq&gjH8=$DgS9&sB{-tFl9iPmZ|4Pb7_c^SMcYJX8ZfLp?4)DVBp~{GGnyM&
z?7gi@KfpfAUohT|=1yi>^&;dk*!CUc&xN3QkS!gpcz*-TXT{LdQ)rvXOg2yJ3jkvT
zi7H$~+d?LDe14@3Sb%|>@=Y{PvXg9b<E6p!&R9KeMe`y{IO29!0<2%LZ%I4aR<hSe
ztvo+NU)*dO=h;ta-ejKEdmkr)38sDy?nUz<`;fO>>lD~C#R{_@Xuf1Tu57~F!Jgag
zI3@C9te$Nn>w3w1WG7g4w*R0M+IBMTu#UAmz`n@5c2+>!L3TCB<B$;C!vg)h%bU^s
z$P{<piWCDIJ;AeOE1Eyq`MSB&1i{LxRW1jh?IgRdRn|QftkuA6@)@*UWW#N(26A9i
z|HP&zpzS8J%d?VZmgmLq;fBd*0c15tE;Pu4?GF$Ve~Pw;Z2!*np4wnTttWz8(E`ch
z`SksCz{)2moajK?OV%+vluZdNX76vsA80{jKdaA~{e&`0*y&a*J~UR=`^bWV*T=Ur
zpF`F2N=3B&WcjW=Pujp-AJ<mQK|4V9!jr$U5A2nfjer?iFd0LB=3EBk<xD+yxFy;_
zGC9WwM$Ec2;Mc8gixxumxIOT5Gnh)>>Fo|^p=2S}DZ&+CJBLED-O<9x{-jiGDgb*^
z5PH}fEu2i!<mc>cFvTdl+kt2iWNccl-Iu@)?CU%pffh;j^YAL+Ah2_4UnGv9MUgEZ
zN;L8X`yo8;(HXR8vIZNc{XSrx4fP5cXotvN1{KL|1N-jcQ&)r*LssC^T;mURGT27G
z0_`x_?<2)!QDCPsKUP<x9U+U0UTuFKEPawV&vUd`vX&bvN@-x@dH0UIL_12R*Rgsq
z6U^t*5}yIIV`OifCv;o|yC^ekHG+1W>{iqHwJ*Tj<hlF#hsWyD39@S5-rQGUQxz(r
zgwRfsJsdIL*8ukYc43wv+9|SK=Q4ts&tXS~`u16Py*M&SdF$8dVEc`Y<mJ)g$s#oU
zH<g3A%m}a&K|4)$O!#hm4H)N>3$5eO&XAoS?l!Im+cy|?dKBN4vt)%1HHJ)US-eKD
z4=v$8+syHRSwDHMH#xK3zeKX)s85+4V4BY!RXxYJb7ZFlU#|QFwq}XY<p*fz$!crQ
z?RX95G}U3W04<5^pzmPeW3UZFQQB!}$z%`W`PbhElX{mPehMvxZ1XqOQ;)!=oa*2_
zfOdiG;?6UB%D{3*PB{6YrIPVZt<Pk>E0LcXmA%l?$W~8Sd4c&p48+!-cSO5L*5N$x
zi&?K#IbNu)MY}|%5jt_gLNKu~=ZofO>0}3$H`p74aSKTC>7iXF6Vmfenhlo3bJSiL
zErYC~YS>m4%qwWoQ*pFRvVayZXH78c237ZA{N`kl(VS9BZp!Fuv@2weTb@|YggDKI
zv-VY^T_qC}aFnqIyIUdS`2;PSEcE;{8CNjl(Z$)1(XNrj>t`PE2IF@+V$QN0G80FQ
zaS>o~uim|XfN{BGTjuvlB!Puy+z6;ZyH57xnz_?8u!|dyX_cbgAoI1Hla&W1KXm&;
z3EEAv!1Yh(F`xTzNm^I|S{~V}j&_AFVDGlEy+}jLCrcJDQW^#OT&Z&@0qqvqEr$I(
z4ru2G4HqVzL@OY>Cl_MMwCKcrIk9MkWO;&7m)OCQIr{ZN(Td2{m<5K6eLG^Dtb)*P
z|7QaSW7r_BCZqAbA6hZlo#iU6OiOZG9K-5om5^=k;9JQ|v!Lh3_-z<>hb-XmNZVz&
zKe5^G8*R|;l1b|}No0ZTn;ZX56|Iy^wBzc&n_$l+R-fZRD<gXq$tl6ii(gjN_yO!+
z-y?gyOYl0g&#rR6#kmo!oUG|n@LCm!Qxfktc#Bp+R+6LXbpfpA&1s1WwEJXBuGtse
z0dr*Rnw^PONp@ayi^~_V>uK>@&!JU;vBNL(=K=hV%}vMz&R$^-`I`B{LYFl@c}UjZ
z#?P(@Hl&-hJQdS;MAoI_{~{mEKG}A{9<;|~cCy`j{(v2Lw8>c(?FrfZ%(l~^FoxW$
zaK7&`j*qL!BsFD~{a}1wUO3Y4h4vJT@?1mb*<SQAD2Max%vQ5+!1JE{bzbdX$8{8=
z>9Nv)8|HWvZrU7R&GFQeNu^}@RluA`O-Sa!d6-@U*$f|U2_=ZTbG()_9_Jt%$p*Sd
z^Cp4~##hbHL3<8H`E8=}c8A+oRYUp#S2D8=F#Q)~I#&+pzlFKjN`3FAs%Xt**UJ9b
z)ctS1UXqzC4~#Q|YbQVHS?`C}ZXw$<e^q28%;i0sZ{d@I)=E}YlW~=4;YX}HE~2%O
zEtBQSvx51v-<#}rGcYf&$ow9RKeh(!y1o5Rmc0g}dwuiQaXZBfsl|#4Kpo^)Z!#Ui
zdeA}E8DEy00q>C^|EuJU_#V9_vu(()=7ww4%51RJ!F;?Udmov8vJc86|3yw}Kj!~E
zS@`AjX}w_4Dvl;SXdlSxj12~U!~C=uFIR^arrAlRTlz+NG0YAA%$?pQg8A$syIpP+
z84mWQYr=^oXdlUJZzMnQ0xKO@(xHs@i7a+aC)au~D^ts6RkUuh%?<mSt-zM*_I3)P
zeI^U8Q7;;We2VsMk)MtE>>=afsJN&D<zhc^>2%io<`=S6f?T(XA+Gbz@!hO?^p#Af
z#=Tk_p1J?~FX9oH<~Ops)7-B#!CYz!4o0GVC)=U1&G9_E$BTQk<w`K0y=2K3FH2kj
z3s6<<EJo`Cqx#VQ*YUt#$Ac8#mJ=tK2Jwb%0qYAe{>NYE4gGaI{MYeMil5MJ`ieRK
zvp=LmHWuSY$egxrS|JYgV5bG!VLiO3Ut}qhg~k6s+tI`Q=ao6yD49*zh!_XFQ*{y>
zd>>=|`As%UqfgZZOwS^#a2Ce>AzS@m(Z~ic`R_LO&=^42zB(0GYF~tU-nQ+wiuqW7
zl)=QYwwJ#*wDl;Mu7>B@m1xZJ8#DEqp7wQMTh%|T+l|ISR{HQsxg^+li&q&jXq;p%
zi@o29f<5AI4n2-Gj?Br|Q%(xZL~Ol7D%yB5EseaY8DP5-)z+1xagiNY|IA|!R%?+l
z*o4MSmc2skz!I>Fhm@3C(0IuDo;a?x1&cWqUEYB<fox~o+{F%H-mjOXzenRGd;dUE
z(+x~u=irxaG(Ix5x{ew@utJadb$w|3WNiv2iJ@Rgn^)W6_=O=rrnpYrfjM5%vKy)z
zH#QDo2$B_d38&?NjULdm;YFKBw)$B_ToKrpmecJx?qLX#)$k;pd;(_hX4Ot%j1wl4
zUoYm-0QNJeoks*sgiO?@{Z$<^&9@bLqG+OIP3LRwPKGw~Gf&s*nz43~Ax0*d=kT7{
z2lPHNP39|_I2rdrgCoqo_%!{f-!fx;V}=CT5Sy?6F)*{#sMG~$l4ScT-*}t>lh)nH
zz7S1{EG_lK!U3=W*)lU{v`J*Mo+l*=Lq6>-zt*RsNt1o&i=WFJ+i-0v->QPoXfoM)
zjrjO+5SQ<@?*3vl8M31e(gw`2X{+SS=1??QvhF1VS}|ap)iX>EqfH@u_k3?3a~!$W
z<m_%%J)24v7{rKTerL+2XYTrfadKpqs(yuspf6&f<>q*H?44%FlLe|BIMD%?%|4VL
zkETE-_pMx5AKH+cw~KzSMN=db<Kx(o1vZZJdCeL$B{J87(t=vB*1f;gEYXz7Dhu4_
z%z-wGV^jSBUNjXlVY$qLMzE%;wI{jJrjZ5zYLNQ~mi5?J{mWRJ#ZU!fwZjaxzmC=a
zi}_sLA_(7#NZvIQr(t>;WM4JBzCQ$eb5}q@4Q)EvbDey_B(U+Ts%mjvjxmF5HowEf
z5csC`1Q^LL9czynnq&{HcS=NnDYTvuScIlU)~(jR+5>EpxOghADKNCjPIbnHEd;wa
z(o|xLaXMsywY}!XU}qQ2nP`JHldRCrJah?IdDiW{)@ZZH_U!tks|co`ZWBEVZ8q6P
zu_KeFfX%q+raco)m+bTOx)DCGxl&aw*r#R8A$#ZE6Fmsu&_DT_*1Q;}M`q4d`du30
zmU#)MOh?lv6WtteSQ6}N`9WC?w7F!D<`(scf_09&^GXTLfUG!g)N>*jU$pB&MKnXQ
zX?CHP+95Bur^RV~!{;}TjQ9BBx;C(vJ3mQ%L7Puj+tOB70w$O@nXM6R0hw^=xpOzb
ze20GO;<_=zh^)}?f>Z%m1f%imLyR*f;|!n6eGIJIHPs#0+8HKfssgJIR6t!4bX!z}
z{S}5O*_m0tyd+><-0Dq_IIBDtk{Jp0iZj=@PnfO<?ZWrjj4UYOV@ocW!O=w%KcktG
zrF~4l?g6&{#-k9NqheT)xhUTjXYN7ZHmy7$f$i}kvI>bMg7Y9Rr>BIZ^1^-;*rl?V
z%wT0|wLUxt+N%P#gpBWc!iWJ}uaGDCj3&k{C9{tD^XERivqB8Tq+giNWn`24)IYdF
zUm{3wwE82OC0Tnwbn7IDJDYUXDiduvnf^y!q48izejEGZ(N>TJpGyoIhIZ$*Ro;@5
zXe-IMZFars`(Il{_AU46FbAaR(r#SqhH<OOnr9hqVqWiSlba~csW7a_+#jah9sv`)
zIjG!$_0yW{h2)u=f54pGg%0<l*^n(#l3(cnb%ISb;*1HJEm>4o=b>7#keA%orl74M
zGptazVvZN~-HqJOs@Ha8U7D+0EFrFSbQ>qDUauv~npYE^0%Na}Tj$%}!n$iu*0Dpg
zG!1NYszFyengiKj7(?|e*b)EAs2DUyvPJh+zKH}IvR`&c8*SZx<}YzA1S~B~b(1FA
zda}}_BHq1V8as|&(LmckChi`zAquSSb`G`48_7QS&RTL0%)dm@fF0wU$mUdTk-r1x
z`?BXZj@cN_WWKW=FD(U|xa#IQ4vcdl`y^^5e;;hHagr;`T**qxmnViX)0F)xJ{P|?
zo5+4t<&^$`vbK0@7C!^ibR)aB?SYj%JR{+SPhaCc2ZlRYLB_HbQea|_%?d>^&V!6U
zjMpO?(#-W46vVw)jLl?2Qh~nAJyp5Rb1e>IUbc`m^A=uX?){oAT$X+a&6BLQQsDq|
z50}Ad_VQ>nFS7O7Ar_%vhWnzmqtLdJ)m_Q@5(TDS&{!Oa=1mrPV|z#l*bA?vYs1le
z$lfj0;E4naTQsnOWxixac@iefxc9rC#)e|tHnP+=PqQMxyc-{FV%c^wN6S#IGO(MM
ztow5@ZU@=YXq^n^9xlJ~WiC6={K(ROq`Z6p&#y<*Jw61@pRA-=`N9E+^A%tH*${0f
z*?j4sK4xB2=RfJ1kG6|Ua(-moez3^GpLMwRi?N%`ko&?D=Dx7z=Q-EaFfM>B-I;r7
zGqeSkHHraT_}ur9t=nAlnmPB8urcU7%L2)EWNbBj3T>99RoNs~KWZ<Tk)k_C4Vc@_
z=!oT*W)Rs-jZ@DHAx$mkAs0ckePq)!pV|pSyX!r}B?#wo82ia4x0PFq!acbC_*~VF
z_i%vheh(Y}H%PN6JZFT}{|Y8s?Bdz<9qbTCom?Nr9V8nxH(vG&Or*H~JL|m-A&Y8z
zHuERg)M$}O<1nA0WQLR1#k)a1FVs%Dz6sL|BWo}-vbzS~oZG|7Vz{=$2q(*F{Pp-8
zJog1*Q^Ht%-3YRd6Z*pfV8KgmujAYZBa-arYj1}$U<SI@@vQbNii~$v`h$&-mxNDt
zuRq}TA)3sFccnTP+`~tnlkae?jB$u;u)ZjqIR-y^COww*t%@P*clWej2W8EWP;|SC
z_kNhnr}};Y^Id5vc-p@J@BIiE^>t(Eyu$D}#tJwu%OJ_{4d&}8nWf%-3sW$wdwN5x
z{=+dcIVGe1Ot{y)v@6%7upe-o%-l=b-xA7}+p~D69PI>|${E*eW*<mj*ZZ6g+DS4k
zi_76J!8(5=v3sMPB0KwNSy~?SAA+asQ1C#DBO6HJcB}=vGAnMOKUzH5zT)V&SHQ}=
zoNlr5a+=I^r|X(QxW9aMuHB<pMrX)gb{^Mb?yCz^Uh&{7+F7!yuZ)v>AWr-0c`n@B
z$w(mUO^Z1B37+MPO=&)?I-W?jRPt5;^Bul-NwRVRKCg3RBE4UhHh@jnZu`a>)0`(;
z5mQpc+*kKgHcn0w<C4fqvQv^SfC+_hno6N1la;He^d^IST&na=94&=xq<H6wg<xUL
zGmf#wE*Hq!9n?7IG2@;MG~wJCBb7{3DDi>^n6$+7N33sC8rg!Hd_`xlsTCI%u*N(W
z$u_>5Qo{~bVl%u6=XDvE$UZO1kLLlK{n@B$F6J|xtmpCmxDlxT4{vBcGDf>h_ABbF
z<N(<FN-?K}Xc=TBcBL&XV4NK%KC#-pOtK<&sn{1_r}uG8T7hv{WM5Q#Z!+i0TNYi_
zVvSd?kO`Ve$KC<6E??u|fN@vJ^rhGnPJ;C;N~m{2%O>*-`W=51tY&li24}QuWXYX}
zkNbkPr44m#M#~}N$O(_}0BgPD>*tA<OIBc)8?gdRgnMd;588FIUWVySb1=Txvs$<Z
zm2rctl22WJ3YbO7ua!X<cav;c;JA1xun#c`Lb$h(kw^AuPIoACjK8I&ckl$p<&$~z
z-i~SoTktJ#8SW=!+#-we3q5oLES>E`)dh?zAS*S@nZn#_n0+sIC=0ESO!c~KY!X<7
z$?2?Yv?8)O4{gr`g1NjfSjrkl-6mVv?l^uom_S#fEAHuK6q8M>&g8QJyV$(_RR^Y7
zLe}hKGQkea_j;pMC)ypdWeXBrt-%Bn{Vsk&yGvH$E@CkgteWfGW-jb&my)G-YMj&p
z`&A!sg$J#SOk8a;w-DG1PFX9~xbz;Gp@+;oelX+my5wmXS5DTXq4R~g=P*66{~K$5
zpn~jX_{tqaV1bzfP0KLuKG~7{d%?_og>4C{a$C?U$?jLp>VFG1*<e@7R<tUz@R^Ag
zcfhn0R^N|Cdq6hD_{VeRx|aFuTppZPW;`UbsL*2D4JK-~_YSUyF&>fi`SN9YgE20R
zq~iWS#$z(+yyRBqUbn8p1G*V_y(eUW-)4MM13R@sB{3bXnv8q&_GAt)5o1lWWVEMb
z+V!ox%)Ms;vip7}q1BL;<Ro-gfr$iowc~z7#xpYO-Vf)>!4iHY3bFE1OXgYmfc+X+
zTyOE&GEB3M%;UZDmQ1ivE5ifjX!T?vj#BHkf=w+Fs&7DRAgl8=2;KlzIPr$j3$#Wu
zp;XmO4Y1Z;+1ht#&&ifmUD`GX?dPXE(d%B~x2lP3XiCIpPUv?OADr3o2<-*glJtZQ
z=9*lM|FvvZzqpxf+6i+-MX-^Za=iFA5sa5)RnA-AG1vKaXn%is3e#*M`|g;&%mOSX
zGI2huKix_eF-vQU2bc`^<Wg3Dtc^^CbB)>-uv4Mku`ZbAD>Bhd&jr1}hEJ(^xS_o!
z8y2=a7zsAruKYKy?J?ev>7H9?5elaKdft_t7}rjw>Gl0XD_EMo-OLMU9c0>HE)7qD
zzD+}6ef~YPw`BRvw|o@9MApj9sYH86#?U_OX9!jrUENTN_MU82M@A}h@BgaHj=MY2
zK9GrCEL<=Q{fR}{_Ikh3I>}t;)SIb6+*I4*mTzcXWa@K{Xqv$F{{QcN7$3<N=XLX*
zgZtB}9ap;q<35q4*B;!<d`1Pl-{eiuy2);d1b+MgbtyEwA@d5_XR`APZ`%)m&2Shx
zyB4j7tR#1O3Ugif>bJ<HEofi<vj<tTW`X(5nd;An?dMlA4r9}R9QfuObmUrPhxU!k
zX>ZhG2WSV^C@pWVLHkbjSzE5M0N(dJJ@KQsrq1XkOU{#ZWbSG9?-2MBjPFVxSph@r
z^Ib5p>$9^%(E7=4Cphkt13Qs%>^|;kW(<%S>LgEQ?p5@Anq}}2;|9qrVh(Xl0^?V*
z%)oubj2~oInk?Bk!Iln1FYCj&A+mQjYgYV*`St_zdfHhwOxCV5X<jLqgx+u_7p`CY
zBnvM5DSHd7_^iwd+*iREA+t(r8fDJmdvWM!C}G?$vd*~04f$ZIyB{uCfHq1t-R=2<
zvHfh8BK5e(gYlcJWJcmN<{l3p!<3D7825*)yhZ5z6|f^qT;!a_Y;1@zwl3FQl=CYJ
z`tw?kmmN<Xs}t-Dic7t<=M~ekr>*>Y35^*z7AJ7jmTd#rL??x+d^8R+*V7&nwqSKa
zX^ll_oMi8lQr?My4F&UGdxAEOtlpcwdjeQXWuR&e+IX^RZ=<cuJ$ZKgTlaC`J#dlT
zb8Qbg1aSqnAr=K=b&#E#%)3Heatm1LrWm(NXgp*OSAM%P18iaWvc^Mb6UYj3R=)ZP
z@3ewY)pCC{UNXnnZKKz~;<%+MtkL+$G&Y~l-3RT2y+EuDwyo^^WL6D(WBtMAaOuMG
zt5GQo^#sUP?L92aT<_lCG#H8PJi8!S(W~~vyI`$%hTq@BxQS$*dXsc)Aur>uWizl{
zVizJ4n^yON4dU|Vk1i3xd<v6EjNdXg-x9w1$zvSnu#1o}Zalul1!)eiJ>)+g<3!2q
zmF>AYAx(K}wTHOY!Y)QO?8@V02634ge>UKr6n1g46Jd?BIUz3Y{98L|OjCmFALSxR
z_K$LrBKt?VOd|V7xk!`!qg*DF{i9rD$o^3-vSj}#mnmfbD3_^Z|0owZGO@MO;;uq@
zt~)dT%apM(GrK(5?l~uSj|1Cpf9y8{O@VCCQ|vDDTlGe-SDs~xWWK|?Za2Xs*Tr)7
zkIf~pE0H~M6SPW#Z`EVvrjXP4jFia+)Me97gB8g6x8uGFb`>(|)F{uG|FvmkFSq<?
O$O02zQr*OyTmC;pP9;JB

diff --git a/GIS Base Map/marshal_positions.shx b/GIS Base Map/marshal_positions.shx
index 67187670a8891f5d3b340e4740b02650b5a5de67..f53d4f3526c80ac5caff984b3621f80894e58242 100644
GIT binary patch
literal 4316
zcmZwGaYWx~90%~$x~}cI)>_xPE?p*FCP^|g$xkLTNoJDil1#cJ$)rn?B$;F;nMsn&
zOp=)-NoHmyvrDGSWRfIFx}?kGem~#WKgXVbUY_Uic-}sr=ZT8??R?ZXM_lvv*{G;9
z;k}W+{`~bqZ9%C1kJzNjlhES7-D$s<HWh>_)8_xq`X{vb&Ex-HEC^2{_k>u^YBsW+
zeH`LAr@6o-u5p`3foEcv#7yR~h__kAdOlzeA90kEoZ~xw;wBFQqr*h%5S_quUgdR`
z@-FMx!Y&T*DW7wOZ@A1a+~e24v*ApUTxV06%|e#2f;DVn2m3k93BKeaKkzemcpMlL
z%Vb_*K8sn#du(7Ed-<4SoZ>v+bCp{>4E!$AxNv>GOJoLfd4soD$@^?&HwQVw7o6o=
zu5g3<JPnMEXBu;OjW>CRwQOc5AMy#G@fBb5BiFghlfduen8GX;FvN0JvytuW;}FL=
z%>^!TjoUm5jEi9sGnvOC-ewi+`G7rq#8FOij_>%1n>+|S7bfzK&LuFNS9zVKyvsVa
zu!{qH%IBQn8!qz;_xLsNd^l4i*ZEXtvydgMU=5qt!F~>Nf-kwq5B$s>9tZvq%Vb_*
zK8sn#du(7Ed-<4SoZ>v+bCp{>42+LvA~TrF8@$Cz-e)VjImi*d;4I&Ag&W-GY2c6X
zOk)nO@h0!Emd)(sLq6d%zT#_s<T`hG5||Lj6lSr2A(pe6jcjKhhd9n@E^vu!+~!f>
zg%~C=lX)!SZC0_K57@&;9OWeE_>P~r$%DYeFp+<jn80*i<#m?wF6-FBE)MW1pL2$9
zxXdry<JZ88;Y^WS7gL$dLYA<CHEd!B`#H=BzT_f5@H2OK9GDc#WL{xDi&@5dY+xIE
z`Iuvz;ymATm0LUvycEqy1H*N?l)+ry;4N12K3mz%L5}bRXZe;Z+~7V>1C!&K#vESb
zP2OQGo7u^Se8OjZ#n=4Eb?)*c@TWMYFpC8Yv7FUxWIOvf#Bok@flFNDHje^RVwl8C
z=CO#kS;cxjU=JU0l#`s}JAUFO4+1ZTiM*f72~6izUS}!qvW_k6;sBrWIcNBW%lyJU
zeho|wXNu%XO=UI<S;7j|u!$Y)=P)Pul8gMn&)ng0;Lov4<`w3%m}R`j2DY)6k2%IE
z&htH2xy8f4v}h(WgSouHTdd@Lwz8Xp9N`Pj@-0`m!F`?v{u0kL=I|PC@(yd+%uYV!
r6F%cBzUD`+bC)N9>2XY977G|+Ijh;ocJ^_I<DBLKm$=4l9!2~Q^~pyr

literal 4516
zcmZwGab%Zy9Ki9l-?P=#uczmEZq;tLx=FfBl1Y+elF1}VCh3yNbV(*jmt<y=B$*`1
zOp+v%B*|owWRfn)F3Dsj$)uZfncVZe=k?Fg{(0^D{r#Tr@9Xpa{VFPcomuhSzZuWp
zl`1Nx<*!}(^N(NV>~3oA_`N!7``SG8PgmV<E&H3A+v*1YTKsqO(03pI|7KIZ44>1?
z&D_a-Ji-$^$IHCQ`+UMze8<m)(;{YU;Bu~IE4Q<QhuF=t?BfmI<72+$7(W$O=7c#^
z#;j)}SF?rN*v`(}{E*7S);;WHKL<F-VUBP-H=Of<;eKKLrFgwm&6;ArRA;@EtGIz%
zxjQ#MrxfNF+;9J=br(<A*SB=pTHlhsC4Ec!mh>&@8|fQm#q&`E^^Nq6^o{h5!u|3N
zk-ky4wZ4(Qk-m|>k-m|>k-kxwUw&Ry&VTA#rEgWEeSNE1to5yGw+?;7ImdaL7kQ0$
z_>j*z$_Y*tR_AAibE|8)ge$q8Teyq*Rfm4z`I9`)E4;-aKILn^r|;MF>S8^;hKsm@
z>$r(KxR;07!(R4tfP)<72*){DIHQsY7jhZba3kBehX>ikGrYv>yvs*?!MFU#Z-qaU
zS;wVZ#SPrb-8{f!JjDyV%G-RvXMDpC{8~732Ip}xo7l|F+{t}B!V^5l%e=|^xp|YB
z53QebloOmPoHdiRx%qRm^qUp>g>|@JaJBcfa2wm%nH%2c`!%b_elPnuz(EdkgyXs4
zoG`!Or(!?k48Nmt%z8G`{mSlFcE7UwmBanQ^T&Cb7kQ0$Xntk$E05X_^ULp5o@D5o
zuV?3k^Jj<qg>?<X_b;p)a>MJ(xt6Wm&JG@8H_x(<H+YYa`I2Kazi_Sa`EmFsXnt{{
zwfV*77n@()?sfBv%`Y~;*!*Jii_I@Kzu5fZQRhr>s&GzzmvEmswOqoLT+c1s#r-_W
zlRVEWyp@~Jf6iUrxBrB%_>P|olZY7`s9&OA(rRD7M88D8M88D8M88D8M88D8M88D8
zM87oum@ubQzf`}p(Y}7EeyM(`eyM(`eyM(`eyM(`eyM(`e(9*s(J$36%kLEKmFbu1
zm+6=3m+6=3m+6=3m+6<Ccb<M(=oii(;#0ondwwbWv6?kp#1&k}P29n~Jj@>UvY!JS
z<S<7#&dI`>N+w*$Wn9CJY~vmtWEaoy60h?vAMpj>@*}?$&MmW!OLOzP&RuT3maW{*
z4jy7R&$5p<c#n_yl4JZ-I4>u3o)@#8ja<zZZeu$;d7P(tk=J;K5BZ#<oZwX9{QOSg
zUh`|Yge$q8Teyq+d6Xx4o>zE_Lww5De9te1wbiWQBCg;%ZsHE^<ze=)m;D^zAcr}^
zaZVQgRLO)3xr}SLk!{?=gY4oNUgCA$<s-h}TYluX!n!i+xRk57fm^wo2Y8I9c!5`W
zn-BPmZ}@><3xA%$d0fmUHghv~avzWI1kdp@Z}L8$@D<<jb76hNj164QwQS{fcJL6p
md6s>=!FznnmmK4#!UZ|uceWsAJsY{2E!@U-cJeq+2mb}$#8P<x

diff --git a/create_index.py b/create_index.py
index fbd818d..d06d1d4 100755
--- a/create_index.py
+++ b/create_index.py
@@ -1,11 +1,17 @@
 #!/usr/bin/python3
 
 import glob, fileinput, os, re, shutil, sys, tempfile, time
+import pprint
 
 year = 2023
 webfile_dir = "~/public_html/GunRun{}/".format(year)
 print("NOTE: year is {}".format(year))
 
+def natural_sort(l): 
+    convert = lambda text: int(text) if text.isdigit() else text.lower()
+    alphanum_key = lambda key: [convert(c) for c in re.split('([0-9]+)', key)]
+    return sorted(l, key=alphanum_key)
+
 webfile_dir = os.path.expanduser(webfile_dir)
 for root, dirs, files in os.walk(webfile_dir):
     documents=[]
@@ -29,7 +35,7 @@ for root, dirs, files in os.walk(webfile_dir):
             canonical.append(name)
 
     most_recent = {}
-    for file in sorted(archive):
+    for file in natural_sort(archive):
         m = re.search("^(\d{{8}}) - (Gun Run {} - .*?)(?:\s*\d+(?:\.\d+)?)?(\.\S+)$".format(year), file, re.IGNORECASE)
         if m:
             date = m.group(1)
@@ -63,7 +69,7 @@ for root, dirs, files in os.walk(webfile_dir):
 
     if canonical:
         output += """<p>Maps</p><ul>"""
-        for link in sorted(canonical):
+        for link in natural_sort(canonical):
             overview=re.search("Marshal overview", link)
             if overview is not None:
                 continue
@@ -77,7 +83,7 @@ for root, dirs, files in os.walk(webfile_dir):
 
     if dirs:
         output +="""<p>Clubs</p><ul>"""
-        dirs.sort()
+        natural_sort(dirs)
         for link in dirs:
             if not os.path.islink(link):
                 output += """<li><a href="{}">{}</a></li>""".format(link, link)
@@ -85,7 +91,8 @@ for root, dirs, files in os.walk(webfile_dir):
 
     if archive:
         archive=[i.split(' - ') for i in archive]
-        archive.sort(key=lambda line: (line[2],line[0]))
+        #archive.sort(key=lambda x: (x[2], x[0]))
+        archive.sort(key=lambda x: (re.split('\s*v?[\d\.]+\w+$', x[2])[0], x[0]))
         archive = [' - '.join(i) for i in archive]
 
         output +="""<p>Source Maps</p><ul>"""
@@ -97,7 +104,7 @@ for root, dirs, files in os.walk(webfile_dir):
         output +="""<p>Marshal maps</p><table style="border-collapse: collapse;">"""
         marshals.sort(key=lambda x: int(re.sub('^.*_(\d+)\..{3,6}?$', '\g<1>', x)))
         positions={}
-        for link in marshals:
+        for link in natural_sort(marshals):
             m = re.search('^(.*?).(pdf|png|jpg|jpeg)$', link)
             if m is not None:
                 positions.setdefault(m.group(1), {})[m.group(2)] = link
@@ -122,4 +129,5 @@ for root, dirs, files in os.walk(webfile_dir):
     indexfile.write(output)
     indexfile.close()
 
+
 # vim: set expandtab shiftwidth=4 softtabstop=4 :